diff options
| author |   Renaud G <renaud@rolisteam.org> | 2022-03-28 23:23:30 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2022-04-13 15:40:42 +0200 |
| commit | c1dca21057dd81c66bf1e164f401b161c2d883ea (patch) | |
| tree | d2813bd30c81c610c1509809eb8a8c782c0568ed /CMakeLists.txt | |
| parent | 70c279ab847883046ef0a951e4d2ccbf6170d19a (diff) | |
| download | OneRoll-c1dca21057dd81c66bf1e164f401b161c2d883ea.tar.gz OneRoll-c1dca21057dd81c66bf1e164f401b161c2d883ea.zip | |
update to new cmake
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5795e12..a22c910 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.5) +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) +find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG COMPONENTS Qml Concurrent) enable_testing(true) include_directories(${CMAKE_CURRENT_SOURCE_DIR} result node) @@ -12,6 +12,10 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} result node) option(BUILD_CLI OFF) option(BUILD_IRC OFF) +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + + SET( dice_sources ${CMAKE_CURRENT_SOURCE_DIR}/diceparser.cpp ${CMAKE_CURRENT_SOURCE_DIR}/range.cpp @@ -112,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 PRIVATE diceparser_shared) +target_link_libraries(diceparser_qobject PUBLIC Qt5::Core Qt5::Gui Qt5::Svg Qt5::Qml Qt5::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() |