From 24bc4dbd8b73fc828d03705c33a305d9a8333a28 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Sun, 17 Feb 2019 16:01:42 +0100 Subject: [PATCH] Use qt conan package instead of local install --- .gitignore | 1 + conanfile.txt | 2 ++ source/CMakeLists.txt | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/.gitignore b/.gitignore index b1a9f41..e027351 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ compile_commands.json _*/ +build/ build-* *.user tags diff --git a/conanfile.txt b/conanfile.txt index c834ab6..2d9562b 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,4 +1,5 @@ [requires] +qt/5.12.0@bincrafters/stable protobuf/3.6.1@bincrafters/stable protoc_installer/3.6.1@bincrafters/stable catch2/2.4.2@bincrafters/stable @@ -8,3 +9,4 @@ cmake [options] protobuf:shared=False +qt:qttools=True diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index a5c5666..ebf0f1b 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -92,6 +92,25 @@ target_link_libraries(${PROJECT_NAME} ${Protobuf_LIBRARIES} ) +if (WIN32) + get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION) + message(STATUS "_qmake_executable: ${_qmake_executable}") + + get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY) + message(STATUS "_qt_bin_dir: ${_qt_bin_dir}") + + find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}") + + if (WINDEPLOYQT_EXECUTABLE) + message(STATUS "Found ${WINDEPLOYQT_EXECUTABLE}") + else() + message(FATAL_ERROR "Unable to find windeployqt") + endif() + + add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD + COMMAND ${WINDEPLOYQT_EXECUTABLE} $) +endif() + add_subdirectory(Age) add_subdirectory(CheckableItem) add_subdirectory(CheckableTest)