Skip to content

use AUTOUIC #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mx1up wants to merge 3 commits into
base: master
Choose a base branch
from
Open

use AUTOUIC #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c77f2b1
use AUTOUIC
mx1up May 17, 2017
c7361f8
use components notation
mx1up May 17, 2017
a88b65f
update icu dll to VS2013
mx1up May 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@ set(PROJECT_VERSION "1.0.0")
# Global CMake options
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)

# Configure Qt
find_package(Qt5Widgets REQUIRED)
find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets)
find_package(Qt5Test REQUIRED)

if (NOT MSVC)
Expand Down
4 changes: 1 addition & 3 deletions source/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/defines.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/defines.h)

file(GLOB_RECURSE UI_FILES *.ui)
file(GLOB_RECURSE CODE_FILES *.cpp)

qt5_wrap_ui(UI_HEADERS ${UI_FILES})
qt5_add_resources(RESOURCE_FILES ../resources/resources.qrc)

# Windows application icon
Expand All @@ -40,7 +38,7 @@ if (WIN32)
endif()

add_executable(${CMAKE_PROJECT_NAME} WIN32
${UI_HEADERS}
# ${UI_HEADERS}
${CODE_FILES}
${RESOURCE_FILES}
${WINDOWS_RES_FILE}
Expand Down
6 changes: 3 additions & 3 deletions win/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ endif()
get_target_property(QtCore_LOCATION Qt5::Core LOCATION)
get_filename_component(QT_DLL_DIR ${QtCore_LOCATION} PATH)
install(FILES
${QT_DLL_DIR}/icudt51.dll
${QT_DLL_DIR}/icuin51.dll
${QT_DLL_DIR}/icuuc51.dll
${QT_DLL_DIR}/icudt54.dll
${QT_DLL_DIR}/icuin54.dll
${QT_DLL_DIR}/icuuc54.dll
${QT_DLL_DIR}/Qt5Core.dll
${QT_DLL_DIR}/Qt5Gui.dll
${QT_DLL_DIR}/Qt5Widgets.dll
Expand Down