From c77f2b1080a5d6feedf7f09f0100f56dd721f3ba Mon Sep 17 00:00:00 2001 From: matthias sweertvaegher Date: Wed, 17 May 2017 19:34:22 +0200 Subject: [PATCH 1/3] use AUTOUIC --- CMakeLists.txt | 1 + source/CMakeLists.txt | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8564210..7dd057a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,7 @@ 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) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 8641f2d..337837c 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -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 @@ -40,7 +38,7 @@ if (WIN32) endif() add_executable(${CMAKE_PROJECT_NAME} WIN32 - ${UI_HEADERS} +# ${UI_HEADERS} ${CODE_FILES} ${RESOURCE_FILES} ${WINDOWS_RES_FILE} From c7361f814d1dca7cb1001f4021672f0ef34ad0e8 Mon Sep 17 00:00:00 2001 From: matthias sweertvaegher Date: Wed, 17 May 2017 19:34:47 +0200 Subject: [PATCH 2/3] use components notation --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7dd057a..8eabd9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ 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) From a88b65f3c489eaffb46d90efc39958cec9fb79e3 Mon Sep 17 00:00:00 2001 From: matthias sweertvaegher Date: Wed, 17 May 2017 19:35:18 +0200 Subject: [PATCH 3/3] update icu dll to VS2013 --- win/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt index 9ba4ee4..9bb38be 100644 --- a/win/CMakeLists.txt +++ b/win/CMakeLists.txt @@ -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