Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add --enable-c++11 configure flag.

Browse source 
And try to detect that compiler version is sufficient for C++11 support.
--enable-broker implies --enable-c++11
This commit is contained in:
Jon Siwek 2015-02-10 12:34:47 -06:00
parent bdf21c054a
commit fc36777e66
4 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -177,8 +177,11 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
######################################################################## ########################################################################
## Recurse on sub-directories ## Recurse on sub-directories
if ( ENABLE_CXX11 )
include(RequireCXX11)
endif ()
if ( ENABLE_BROKER ) if ( ENABLE_BROKER )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
add_subdirectory(aux/broker) add_subdirectory(aux/broker)
set(brodeps ${brodeps} broker) set(brodeps ${brodeps} broker)
add_definitions(-DENABLE_BROKER) add_definitions(-DENABLE_BROKER)

2
aux/broker

@ -1 +1 @@
Subproject commit 4fae86cd67b999f48a2f2f354c91e4b1b343b2a1 Subproject commit 0af74017e28d78179a25d60ca80385af444d39f1

2
cmake

@ -1 +1 @@
Subproject commit c2057b7f15dedc27641a50312384505ce4f2112c Subproject commit 532dd04e8c5027c613a65ea10bcdbaf5e876fcfa

5
configure vendored
View file

@ -41,6 +41,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
--enable-perftools-debug use Google's perftools for debugging --enable-perftools-debug use Google's perftools for debugging
--enable-jemalloc link against jemalloc --enable-jemalloc link against jemalloc
--enable-ruby build ruby bindings for broccoli (deprecated) --enable-ruby build ruby bindings for broccoli (deprecated)
--enable-c++11 build using the C++11 standard
--enable-broker enable use of the Broker communication library --enable-broker enable use of the Broker communication library
(requires C++ Actor Framework and C++11) (requires C++ Actor Framework and C++11)
--disable-broccoli don't build or install the Broccoli library --disable-broccoli don't build or install the Broccoli library
@ -182,7 +183,11 @@ while [ $# -ne 0 ]; do
--enable-jemalloc) --enable-jemalloc)
append_cache_entry ENABLE_JEMALLOC BOOL true append_cache_entry ENABLE_JEMALLOC BOOL true
;; ;;
--enable-c++11)
append_cache_entry ENABLE_CXX11 BOOL true
;;
--enable-broker) --enable-broker)
append_cache_entry ENABLE_CXX11 BOOL true
append_cache_entry ENABLE_BROKER BOOL true append_cache_entry ENABLE_BROKER BOOL true
;; ;;
--disable-broccoli) --disable-broccoli)