Use std::jthread and C++17.

[stg.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b03670a2948fd23f2b041ac64900a2f056d458f..6263a2434d1686d2e0ebc5c6b52323f2f43ff440 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,14 +4,9 @@ project ( Stargazer )
 
 set ( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
 
 
 set ( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
 

-if ( CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.2 )
-    message ( FATAL_ERROR "Require at least gcc-5.2" )
-endif( CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.2 )
-

 option ( BUILD_STG "Build Stargazer server." OFF )
 option ( BUILD_SGCONF "Build SGConf client." OFF )
 option ( BUILD_RSCRIPTD "Build RScriptD server." OFF )
 option ( BUILD_STG "Build Stargazer server." OFF )
 option ( BUILD_SGCONF "Build SGConf client." OFF )
 option ( BUILD_RSCRIPTD "Build RScriptD server." OFF )

-option ( BUILD_RLM_STG "Build rlm_stg FreeRADIUS module." OFF )

 option ( BUILD_SGAUTH "Build SGAuth client." OFF )
 
 # General modules
 option ( BUILD_SGAUTH "Build SGAuth client." OFF )
 
 # General modules


@@ -36,7 +31,6 @@ option ( BUILD_MOD_STORE_MYSQL "Build MySQL store STG module." OFF )
 option ( BUILD_MOD_RPCCONFIG "Build XML-RPC configuretion STG module." OFF )
 option ( BUILD_MOD_CAP_PCAP "Build PCap capture STG module." OFF )
 option ( BUILD_MOD_CAP_NFQUEUE "Build NFQueue capture STG module." OFF )
 option ( BUILD_MOD_RPCCONFIG "Build XML-RPC configuretion STG module." OFF )
 option ( BUILD_MOD_CAP_PCAP "Build PCap capture STG module." OFF )
 option ( BUILD_MOD_CAP_NFQUEUE "Build NFQueue capture STG module." OFF )

-option ( BUILD_MOD_RADIUS "Build rlm_stg backend STG module." OFF )

 
 # Grouping
 option ( BUILD_ALL_MODS "Build all modules." OFF )
 
 # Grouping
 option ( BUILD_ALL_MODS "Build all modules." OFF )


@@ -51,7 +45,6 @@ if ( BUILD_ALL )
     set ( BUILD_TESTS ON )
     set ( BUILD_SGAUTH ON )
     set ( BUILD_RSCRIPTD ON )
     set ( BUILD_TESTS ON )
     set ( BUILD_SGAUTH ON )
     set ( BUILD_RSCRIPTD ON )

-    set ( BUILD_RLM_STG ON )

     set ( BUILD_SGCONF ON )
     set ( BUILD_STG ON )
 endif ( BUILD_ALL )
     set ( BUILD_SGCONF ON )
     set ( BUILD_STG ON )
 endif ( BUILD_ALL )


@@ -76,10 +69,9 @@ if ( BUILD_RSCRIPTD OR BUILD_ALL_LIBS )
     set ( BUILD_LIB_SCRIPTEXECUTER ON )
 endif ( BUILD_RSCRIPTD OR BUILD_ALL_LIBS )
 
     set ( BUILD_LIB_SCRIPTEXECUTER ON )
 endif ( BUILD_RSCRIPTD OR BUILD_ALL_LIBS )
 

-if ( BUILD_RLM_STG OR BUILD_ALL_LIBS )
+if ( BUILD_ALL_LIBS )

     set ( BUILD_LIB_CRYPTO ON )
     set ( BUILD_LIB_CRYPTO ON )

-    set ( BUILD_LIB_JSON ON )
-endif ( BUILD_RLM_STG OR BUILD_ALL_LIBS )
+endif ( BUILD_ALL_LIBS )

 
 if ( BUILD_STG OR BUILD_ALL_LIBS )
     set ( BUILD_LIB_CONFFILES ON )
 
 if ( BUILD_STG OR BUILD_ALL_LIBS )
     set ( BUILD_LIB_CONFFILES ON )


@@ -95,21 +87,14 @@ if ( BUILD_ALL_MODS )
     set ( BUILD_MOD_STORE_POSTGRESQL ON )
     set ( BUILD_MOD_RPCCONFIG ON )
     set ( BUILD_MOD_CAP_PCAP ON )
     set ( BUILD_MOD_STORE_POSTGRESQL ON )
     set ( BUILD_MOD_RPCCONFIG ON )
     set ( BUILD_MOD_CAP_PCAP ON )

-    set ( BUILD_MOD_CAP_NFQUEUE ON )
-    set ( BUILD_MOD_RADIUS ON )

 endif ( BUILD_ALL_MODS )
 
 if ( BUILD_MOD_STORE_FIREBIRD OR BUILD_ALL_LIBS )
     set ( BUILD_LIB_IBPP ON )
 endif ( BUILD_MOD_STORE_FIREBIRD OR BUILD_ALL_LIBS )
 
 endif ( BUILD_ALL_MODS )
 
 if ( BUILD_MOD_STORE_FIREBIRD OR BUILD_ALL_LIBS )
     set ( BUILD_LIB_IBPP ON )
 endif ( BUILD_MOD_STORE_FIREBIRD OR BUILD_ALL_LIBS )
 

-if ( BUILD_MOD_RADIUS OR BUILD_ALL_LIBS )
-    set ( BUILD_LIB_JSON ON )
-    set ( BUILD_LIB_IBPP ON )
-endif ( BUILD_MOD_RADIUS OR BUILD_ALL_LIBS )
-

 if ( BUILD_MOD_PING 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 )
 endif ( BUILD_MOD_PING OR BUILD_ALL_LIBS )
 
 if ( BUILD_MOD_SMUX OR BUILD_ALL_LIBS )


@@ -117,7 +102,7 @@ if ( BUILD_MOD_SMUX OR BUILD_ALL_LIBS )
 endif ( BUILD_MOD_SMUX OR BUILD_ALL_LIBS )
 
 enable_language (CXX)
 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 )
 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 )


@@ -131,6 +116,9 @@ if ( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
     if ( BUILD_LIB_IBPP )
         add_definitions ( -DIBPP_LINUX )
     endif ( BUILD_LIB_IBPP )
     if ( BUILD_LIB_IBPP )
         add_definitions ( -DIBPP_LINUX )
     endif ( BUILD_LIB_IBPP )

+    if ( BUILD_ALL_MODS )
+        set ( BUILD_MOD_CAP_NFQUEUE ON )
+    endif ( BUILD_ALL_MODS )

 elseif ( ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" )
     add_definitions ( -DFREE_BSD )
     set ( BUILD_MOD_CAP_ETHER_FREEBSD ON )
 elseif ( ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" )
     add_definitions ( -DFREE_BSD )
     set ( BUILD_MOD_CAP_ETHER_FREEBSD ON )


@@ -142,38 +130,19 @@ elseif ( ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" )
 elseif ( ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" )
     add_definitions ( -DDARWIN )
     if ( BUILD_LIB_IBPP )
 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 )
     endif ( BUILD_LIB_IBPP )
 else ()
     message ( WARNING "Unsupported system: '${CMAKE_SYSTEM_NAME}'" )
 endif ()
 
 include_directories ( include )

+include_directories ( 3rdparty/jthread/source )

 
 add_subdirectory ( libs )
 
 add_subdirectory ( libs )

-
-if ( BUILD_RLM_STG )
-    add_subdirectory ( rlm_stg )
-endif ( BUILD_RLM_STG )
-
-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 )
 
 if ( BUILD_TESTS )

+    enable_testing ()

     add_subdirectory ( tests )
 endif ( BUILD_TESTS )
     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)