diff options
| author | Jonas Kvinge <jonas@jkvinge.net> | 2020-10-18 00:48:31 +0200 |
|---|---|---|
| committer | Jonas Kvinge <jonas@jkvinge.net> | 2020-10-18 01:02:09 +0200 |
| commit | 82f28549e60d56d7fe4cef15c980793584f556ac (patch) | |
| tree | 3ef4f8e269dc934979544893f4cb5055b26823c8 | |
| parent | Merge pull request #113 from Shatur95/fix-conversion-warning (diff) | |
| download | singleapplication-82f28549e60d56d7fe4cef15c980793584f556ac.tar.xz | |
Update CMake to support Qt 6
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 85dba84..408fec2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,22 +10,26 @@ add_library(${PROJECT_NAME} STATIC ) add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) +set(QT_MAJOR_VERSION 5 CACHE STRING "Qt version to use (5 or 6), defaults to 5") + # Find dependencies -find_package(Qt5 COMPONENTS Network REQUIRED) -target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Network) +set(QT_COMPONENTS Core Network) +set(QT_LIBRARIES Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Network) if(QAPPLICATION_CLASS STREQUAL QApplication) - find_package(Qt5 COMPONENTS Widgets REQUIRED) - target_link_libraries(${PROJECT_NAME} PUBLIC Qt5::Widgets) + list(APPEND QT_COMPONENTS Widgets) + list(APPEND QT_LIBRARIES Qt${QT_MAJOR_VERSION}::Widgets) elseif(QAPPLICATION_CLASS STREQUAL QGuiApplication) - find_package(Qt5 COMPONENTS Gui REQUIRED) - target_link_libraries(${PROJECT_NAME} PUBLIC Qt5::Gui) + list(APPEND QT_COMPONENTS Gui) + list(APPEND QT_LIBRARIES Qt${QT_MAJOR_VERSION}::Gui) else() set(QAPPLICATION_CLASS QCoreApplication) - find_package(Qt5 COMPONENTS Core REQUIRED) - target_link_libraries(${PROJECT_NAME} PUBLIC Qt5::Core) endif() +find_package(Qt${QT_MAJOR_VERSION} COMPONENTS ${QT_COMPONENTS} REQUIRED) + +target_link_libraries(${PROJECT_NAME} PUBLIC ${QT_LIBRARIES}) + if(WIN32) target_link_libraries(${PROJECT_NAME} PRIVATE advapi32) endif() |