diff options
| author |  Alexey Sokolov | 2024-02-12 22:49:14 +0000 |
|---|---|---|
| committer |  GitHub | 2024-02-12 23:49:14 +0100 |
| commit | f5b1a71ba890a69f4ecf09b61a5d16014c873e37 (patch) | |
| tree | fa1759a3446dfe09a991cce5d8242edebc130002 | |
| parent | Add a qt6 linux CI build (#2605) (diff) | |
| download | KVIrc-f5b1a71ba890a69f4ecf09b61a5d16014c873e37.tar.gz KVIrc-f5b1a71ba890a69f4ecf09b61a5d16014c873e37.tar.bz2 KVIrc-f5b1a71ba890a69f4ecf09b61a5d16014c873e37.zip | |
Use target_compile_features to select C++ standard (#2607)
* Use target_compile_features to select C++ standard
* Modules and binary already inherit from kvilib
| -rw-r--r-- | cmake/module.rules.txt | 4 | ||||
| -rw-r--r-- | src/kvilib/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/kvirc/CMakeLists.txt | 4 |
3 files changed, 1 insertions, 10 deletions
diff --git a/cmake/module.rules.txt b/cmake/module.rules.txt index dbb882cf7..222d6fc67 100644 --- a/cmake/module.rules.txt +++ b/cmake/module.rules.txt @@ -9,10 +9,6 @@ endif() add_library(${kvi_module_name} MODULE ${${kvi_module_name}_SRCS} ${${kvi_module_name}_MOC_SRCS}) -# Enable C++11 -set_property(TARGET ${kvi_module_name} PROPERTY CXX_STANDARD 17) -set_property(TARGET ${kvi_module_name} PROPERTY CXX_STANDARD_REQUIRED ON) - target_link_libraries(${kvi_module_name} ${KVILIB_BINARYNAME} ${KVIRC_BINARYNAME} ${LIBS} ${qt_kvirc_modules}) set_target_properties(${kvi_module_name} PROPERTIES LINK_FLAGS "${MODULE_ADDITIONAL_LINK_FLAGS}") diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt index 0f02646b9..577fc6fd2 100644 --- a/src/kvilib/CMakeLists.txt +++ b/src/kvilib/CMakeLists.txt @@ -132,8 +132,7 @@ add_library(${KVILIB_BINARYNAME} SHARED ${kvilib_SRCS} ${kvilib_MOC_SRCS}) target_link_libraries(${KVILIB_BINARYNAME} ${LIBS} ${qt_kvirc_modules}) # Enable C++17 -set_property(TARGET ${KVILIB_BINARYNAME} PROPERTY CXX_STANDARD 17) -set_property(TARGET ${KVILIB_BINARYNAME} PROPERTY CXX_STANDARD_REQUIRED ON) +target_compile_features(${KVILIB_BINARYNAME} PUBLIC cxx_std_17) set_target_properties(${KVILIB_BINARYNAME} PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR} LINK_FLAGS "${ADDITIONAL_LINK_FLAGS}") diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt index eceb91af1..ccdfad3fd 100644 --- a/src/kvirc/CMakeLists.txt +++ b/src/kvirc/CMakeLists.txt @@ -270,10 +270,6 @@ endif() target_link_libraries(${KVIRC_BINARYNAME} ${KVILIB_BINARYNAME} ${LIBS} ${qt_kvirc_modules}) -# Enable C++17 -set_property(TARGET ${KVIRC_BINARYNAME} PROPERTY CXX_STANDARD 17) -set_property(TARGET ${KVIRC_BINARYNAME} PROPERTY CXX_STANDARD_REQUIRED ON) - if(MINGW) # For some reason CMake doesn't do this itself... # In case of MSVC, it does add /implib:kvirc.lib though |