Use std::jthread and C++17.

[stg.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ca566860ad2ffd4ad05e47289998406376423cb..6263a2434d1686d2e0ebc5c6b52323f2f43ff440 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,10 +4,6 @@ project ( Stargazer )
 
 set ( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
 
-if ( CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.5 )
-    message ( FATAL_ERROR "Require at least gcc-6.5" )
-endif( CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.5 )
-
 option ( BUILD_STG "Build Stargazer server." OFF )
 option ( BUILD_SGCONF "Build SGConf client." OFF )
 option ( BUILD_RSCRIPTD "Build RScriptD server." OFF )
@@ -98,7 +94,7 @@ if ( BUILD_MOD_STORE_FIREBIRD OR BUILD_ALL_LIBS )
 endif ( BUILD_MOD_STORE_FIREBIRD OR BUILD_ALL_LIBS )
 
 if ( BUILD_MOD_PING OR BUILD_ALL_LIBS )
-        set ( BUILD_LIB_PINGER ON )
+    set ( BUILD_LIB_PINGER ON )
 endif ( BUILD_MOD_PING OR BUILD_ALL_LIBS )
 
 if ( BUILD_MOD_SMUX OR BUILD_ALL_LIBS )
@@ -106,7 +102,7 @@ if ( BUILD_MOD_SMUX OR BUILD_ALL_LIBS )
 endif ( BUILD_MOD_SMUX OR BUILD_ALL_LIBS )
 
 enable_language (CXX)
-set (CMAKE_CXX_STANDARD 14)
+set (CMAKE_CXX_STANDARD 17)
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wall -Wextra -Wshadow -Wno-long-long -Wold-style-cast -Wstrict-aliasing -pedantic")
 
 if ( CMAKE_COMPILER_IS_GNUCC )
@@ -134,34 +130,19 @@ elseif ( ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" )
 elseif ( ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" )
     add_definitions ( -DDARWIN )
     if ( BUILD_LIB_IBPP )
-            add_definitions ( -DIBPP_DARWIN )
+        add_definitions ( -DIBPP_DARWIN )
     endif ( BUILD_LIB_IBPP )
 else ()
     message ( WARNING "Unsupported system: '${CMAKE_SYSTEM_NAME}'" )
 endif ()
 
 include_directories ( include )
+include_directories ( 3rdparty/jthread/source )
 
 add_subdirectory ( libs )
-
-if ( BUILD_RSCRIPTD )
-    add_subdirectory ( rscriptd )
-endif ( BUILD_RSCRIPTD )
-
-if ( BUILD_SGAUTH )
-    add_subdirectory ( sgauth )
-endif ( BUILD_SGAUTH )
-
-if ( BUILD_SGCONF )
-    add_subdirectory ( sgconf )
-endif ( BUILD_SGCONF )
-
-if ( BUILD_STG )
-    add_subdirectory ( stargazer )
-endif ( BUILD_STG )
+add_subdirectory ( projects )
 
 if ( BUILD_TESTS )
+    enable_testing ()
     add_subdirectory ( tests )
 endif ( BUILD_TESTS )
-
-add_custom_target (cppcheck COMMAND cppcheck --enable=all --std=c++14 ${CMAKE_SOURCE_DIR}/rlm_stg ${CMAKE_SOURCE_DIR}/rscriptd ${CMAKE_SOURCE_DIR}/sgauth ${CMAKE_SOURCE_DIR}/sgconf ${CMAKE_SOURCE_DIR}/sgconv ${CMAKE_SOURCE_DIR}/stargazer)