diff options
| author | Dominik Schmidt <dev@dominik-schmidt.de> | 2018-06-27 11:05:59 +0300 |
|---|---|---|
| committer | Dominik Schmidt <dev@dominik-schmidt.de> | 2018-06-27 11:05:59 +0300 |
| commit | 839f18d9d0da1b236d862c3273fe94bc26fd5d50 (patch) | |
| tree | 8e1fd8303dfb6c60b63fd8b9811819b5ceeb3a6e | |
| parent | 3f92d83acf3c1110105a18c8e254e37d3dce73cc (diff) | |
Do not use qt5_use_modules which was removed from Qt 5.11
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/libcrashreporter-gui/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/libcrashreporter-handler/CMakeLists.txt | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a78c25..d0bbb34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,9 @@ if(POLICY CMP0071) cmake_policy(SET CMP0071 NEW) endif() +if(NOT TARGET Qt5::Core) + find_package(Qt5 COMPONENTS Core Network Widgets) +endif() if((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS) OR (UNIX AND NOT APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")) diff --git a/src/libcrashreporter-gui/CMakeLists.txt b/src/libcrashreporter-gui/CMakeLists.txt index d8047b3..d32a1e5 100644 --- a/src/libcrashreporter-gui/CMakeLists.txt +++ b/src/libcrashreporter-gui/CMakeLists.txt @@ -32,8 +32,9 @@ add_library(crashreporter-gui STATIC target_include_directories(crashreporter-gui PUBLIC ${crashreporter_INCLUDE_DIRECTORIES}) target_link_libraries(crashreporter-gui - ${QT_QTGUI_LIBRARY} - ${QT_QTNETWORK_LIBRARY} + Qt5::Core + Qt5::Widgets + Qt5::Network ${crashreporter_LIBRARIES} ) @@ -43,5 +44,3 @@ set_target_properties(crashreporter-gui PROPERTIES AUTOMOC ON) # RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} # LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} #) - -qt5_use_modules(crashreporter-gui Core Widgets Network) diff --git a/src/libcrashreporter-handler/CMakeLists.txt b/src/libcrashreporter-handler/CMakeLists.txt index e9bd6a0..135a2af 100644 --- a/src/libcrashreporter-handler/CMakeLists.txt +++ b/src/libcrashreporter-handler/CMakeLists.txt @@ -16,8 +16,9 @@ list(APPEND crashreporter-handler_LIBRARIES add_library(crashreporter-handler STATIC ${crashreporter-handler_SOURCES}) target_include_directories(crashreporter-handler PUBLIC ${crashreporter-handler_INCLUDE_DIRECTORIES}) -target_link_libraries(crashreporter-handler ${crashreporter-handler_LIBRARIES}) -qt5_use_modules(crashreporter-handler Core) +target_link_libraries(crashreporter-handler + ${crashreporter-handler_LIBRARIES} + Qt5::Core) if(WIN32) add_definitions( -DUNICODE ) #-fshort-wchar ) |