diff options
| author |   Renaud G <renaud@rolisteam.org> | 2022-04-13 15:24:02 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2022-04-13 15:40:42 +0200 |
| commit | 44bf6ecfdca6b0499b5ae2cf7b380a3ff310f0e9 (patch) | |
| tree | 7a36c16a5d811f2dddcef123c666e0048ee33477 /CMakeLists.txt | |
| parent | c1dca21057dd81c66bf1e164f401b161c2d883ea (diff) | |
| download | OneRoll-44bf6ecfdca6b0499b5ae2cf7b380a3ff310f0e9.tar.gz OneRoll-44bf6ecfdca6b0499b5ae2cf7b380a3ff310f0e9.zip | |
qt6 ready
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a22c910..dd3b026 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.16) project(diceparser VERSION 1.9.0 DESCRIPTION "Parser of dice command") -set(QT_REQUIRED_VERSION "5.12.0") -find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Core Test Gui Svg) -find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG COMPONENTS Qml Concurrent) +set(QT_REQUIRED_VERSION "6.3.0") +find_package(Qt6 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Core Test Gui Svg) +find_package(Qt6 ${QT_REQUIRED_VERSION} CONFIG COMPONENTS Qml Concurrent) enable_testing(true) include_directories(${CMAKE_CURRENT_SOURCE_DIR} result node) @@ -67,7 +67,7 @@ SET( dice_sources IF(STATIC_BUILD) add_library(diceparser_static STATIC ${dice_sources} ) target_include_directories(diceparser_static PRIVATE include) - target_link_libraries(diceparser_static PUBLIC Qt5::Core Qt5::Gui Qt5::Svg) + target_link_libraries(diceparser_static PUBLIC Qt6::Core Qt6::Gui Qt6::Svg) install(TARGETS diceparser_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() @@ -80,7 +80,7 @@ target_include_directories(diceparser_shared PRIVATE include ./) SET_TARGET_PROPERTIES(diceparser_shared PROPERTIES OUTPUT_NAME diceparser CLEAN_DIRECT_OUTPUT 1) -target_link_libraries(diceparser_shared PUBLIC Qt5::Core Qt5::Gui Qt5::Svg) +target_link_libraries(diceparser_shared PUBLIC Qt6::Core Qt6::Gui Qt6::Svg) set_target_properties(diceparser_shared PROPERTIES VERSION ${PROJECT_VERSION}) set_target_properties(diceparser_shared PROPERTIES SOVERSION 1) @@ -108,7 +108,7 @@ configure_file(diceparser.pc.in diceparser.pc @ONLY) install(FILES ${CMAKE_BINARY_DIR}/diceparser.pc DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig) -if(Qt5Qml_FOUND) +if(Qt6Qml_FOUND) set(dice_header_qobject qmltypesregister.h diceroller.h) set(dice_source_qobject qmltypesregister.cpp diceroller.cpp) set(CMAKE_AUTOMOC ON) @@ -116,7 +116,7 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) add_library(diceparser_qobject SHARED ${dice_header_qobject} ${dice_source_qobject}) -target_link_libraries(diceparser_qobject PUBLIC Qt5::Core Qt5::Gui Qt5::Svg Qt5::Qml Qt5::Concurrent PRIVATE diceparser_shared) +target_link_libraries(diceparser_qobject PUBLIC Qt6::Core Qt6::Gui Qt6::Svg Qt6::Qml Qt6::Concurrent PRIVATE diceparser_shared) message("Messages diceparser ${CMAKE_CURRENT_SOURCE_DIR}/include") target_include_directories(diceparser_qobject PRIVATE include ./ ${CMAKE_CURRENT_SOURCE_DIR}/include) endif() |