aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Alexey Sokolov2018-06-05 23:59:45 +0100
committerGravatar IceN9ne2018-11-14 08:59:22 -0500
commit3f98a24941b323ee8190e58356b99d6afd4ec648 (patch)
treee53c35c753894ba9a3562b1f5b3e85d4e90c41e4
parentTravis: use GCC 6 (diff)
downloadKVIrc-3f98a24941b323ee8190e58356b99d6afd4ec648.tar.gz
KVIrc-3f98a24941b323ee8190e58356b99d6afd4ec648.tar.bz2
KVIrc-3f98a24941b323ee8190e58356b99d6afd4ec648.zip
Use C++14
-rw-r--r--cmake/module.rules.txt4
-rw-r--r--src/kvilib/CMakeLists.txt4
-rw-r--r--src/kvirc/CMakeLists.txt4
3 files changed, 6 insertions, 6 deletions
diff --git a/cmake/module.rules.txt b/cmake/module.rules.txt
index fff692fef..5c3bbd9ea 100644
--- a/cmake/module.rules.txt
+++ b/cmake/module.rules.txt
@@ -10,7 +10,7 @@ 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 11)
+set_property(TARGET ${kvi_module_name} PROPERTY CXX_STANDARD 14)
set_property(TARGET ${kvi_module_name} PROPERTY CXX_STANDARD_REQUIRED ON)
target_link_libraries(${kvi_module_name} ${KVILIB_BINARYNAME} ${KVIRC_BINARYNAME} ${LIBS})
@@ -41,4 +41,4 @@ endif()
install(TARGETS ${kvi_module_name} LIBRARY DESTINATION "${KVIRC_MOD_PATH}")
if(WIN32)
install(FILES $<TARGET_PDB_FILE:${kvi_module_name}> DESTINATION ${KVIRC_MOD_PATH} OPTIONAL)
-endif() \ No newline at end of file
+endif()
diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt
index 52524e837..c62698c5c 100644
--- a/src/kvilib/CMakeLists.txt
+++ b/src/kvilib/CMakeLists.txt
@@ -130,8 +130,8 @@ endif()
add_library(${KVILIB_BINARYNAME} SHARED ${kvilib_SRCS} ${kvilib_MOC_SRCS})
target_link_libraries(${KVILIB_BINARYNAME} ${LIBS})
-# Enable C++11
-set_property(TARGET ${KVILIB_BINARYNAME} PROPERTY CXX_STANDARD 11)
+# Enable C++14
+set_property(TARGET ${KVILIB_BINARYNAME} PROPERTY CXX_STANDARD 14)
set_property(TARGET ${KVILIB_BINARYNAME} PROPERTY CXX_STANDARD_REQUIRED ON)
diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt
index 824d1eba5..3ff67e763 100644
--- a/src/kvirc/CMakeLists.txt
+++ b/src/kvirc/CMakeLists.txt
@@ -270,8 +270,8 @@ endif()
target_link_libraries(${KVIRC_BINARYNAME} ${KVILIB_BINARYNAME} ${LIBS})
-# Enable C++11
-set_property(TARGET ${KVIRC_BINARYNAME} PROPERTY CXX_STANDARD 11)
+# Enable C++14
+set_property(TARGET ${KVIRC_BINARYNAME} PROPERTY CXX_STANDARD 14)
set_property(TARGET ${KVIRC_BINARYNAME} PROPERTY CXX_STANDARD_REQUIRED ON)
if(Qt5Widgets_FOUND)