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

Changed default CMAKE_BUILD_TYPE to RelWithDebInfo

Browse source 
The --enable-debug option of the configure wrapper changes it to Debug.
Removed --enable-release option of the configure wrapper.
Updated submodules
This commit is contained in:
Jon Siwek 2010-11-18 11:34:29 -06:00
parent d9def9e7d5
commit e4d12ea1d3
6 changed files with 8 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -22,18 +22,13 @@ endif ()
file(STRINGS "${CMAKE_SOURCE_DIR}/VERSION" VERSION LIMIT_COUNT 1) file(STRINGS "${CMAKE_SOURCE_DIR}/VERSION" VERSION LIMIT_COUNT 1)
if (ENABLE_DEBUG AND ENABLE_RELEASE)
set(CMAKE_BUILD_TYPE RelWithDebInfo)
elseif (ENABLE_DEBUG AND NOT ENABLE_RELEASE)
set(CMAKE_BUILD_TYPE Debug)
elseif (NOT ENABLE_DEBUG AND ENABLE_RELEASE)
set(CMAKE_BUILD_TYPE Release)
endif ()
set(EXTRA_COMPILE_FLAGS "-Wall -Wno-unused") set(EXTRA_COMPILE_FLAGS "-Wall -Wno-unused")
if (ENABLE_DEBUG) if (ENABLE_DEBUG)
set(CMAKE_BUILD_TYPE Debug)
set(EXTRA_COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} -DDEBUG") set(EXTRA_COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} -DDEBUG")
else ()
set(CMAKE_BUILD_TYPE RelWithDebInfo)
endif () endif ()
# Compiler flags may already exist in CMake cache (e.g. when specifying # Compiler flags may already exist in CMake cache (e.g. when specifying
@ -232,7 +227,6 @@ message(
"\nInstall prefix: ${CMAKE_INSTALL_PREFIX}" "\nInstall prefix: ${CMAKE_INSTALL_PREFIX}"
"\nPolicy dir: ${POLICYDIR}" "\nPolicy dir: ${POLICYDIR}"
"\nDebug mode: ${ENABLE_DEBUG}" "\nDebug mode: ${ENABLE_DEBUG}"
"\nRelease mode: ${ENABLE_RELEASE}"
"\n" "\n"
"\nCC: ${CMAKE_C_COMPILER}" "\nCC: ${CMAKE_C_COMPILER}"
"\nCFLAGS: ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${BuildType}}" "\nCFLAGS: ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${BuildType}}"

2
aux/binpac

@ -1 +1 @@
Subproject commit 87868e0fbeba599c004dd8e9d489d30391fa4212 Subproject commit 9886b3d16447bd7c8575b8b4a190767183a6d1a7

2
aux/bro-aux

@ -1 +1 @@
Subproject commit cb699479a2acf25f552847beaf53cdef239ef5ce Subproject commit ac747bc3c3d64fa963e4b2238df7441af4d513b5

2
aux/broccoli

@ -1 +1 @@
Subproject commit 48b84f0e5a0208362417adee24e973360514faf2 Subproject commit 7ec41e3af3009c468d70b22fda143ba4dc1c151c

2
aux/broctl

@ -1 +1 @@
Subproject commit 7e53d2668b9b99d1e39776620e85e35360d46229 Subproject commit 3477e6e88118f82bd483b156796f8e484267965c

7
configure vendored
View file

@ -23,8 +23,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
[PREFIX/share/bro] [PREFIX/share/bro]
Optional Features: Optional Features:
--enable-debug compile with debugging symbols --enable-debug compile in debugging mode
--enable-release compile with optimizations
--enable-brov6 enable IPv6 processing --enable-brov6 enable IPv6 processing
--enable-perftools use Google's perftools --enable-perftools use Google's perftools
--enable-broccoli build/install the Broccoli library --enable-broccoli build/install the Broccoli library
@ -74,7 +73,6 @@ append_cache_entry BRO_ROOT_DIR PATH /usr/local/bro
append_cache_entry PY_MOD_INSTALL_DIR PATH /usr/local/bro/lib/broctl append_cache_entry PY_MOD_INSTALL_DIR PATH /usr/local/bro/lib/broctl
append_cache_entry POLICYDIR STRING /usr/local/bro/share/bro append_cache_entry POLICYDIR STRING /usr/local/bro/share/bro
append_cache_entry ENABLE_DEBUG BOOL false append_cache_entry ENABLE_DEBUG BOOL false
append_cache_entry ENABLE_RELEASE BOOL false
append_cache_entry BROv6 BOOL false append_cache_entry BROv6 BOOL false
append_cache_entry ENABLE_PERFTOOLS BOOL false append_cache_entry ENABLE_PERFTOOLS BOOL false
append_cache_entry BinPAC_SKIP_INSTALL BOOL true append_cache_entry BinPAC_SKIP_INSTALL BOOL true
@ -112,9 +110,6 @@ while [ $# -ne 0 ]; do
--enable-debug) --enable-debug)
append_cache_entry ENABLE_DEBUG BOOL true append_cache_entry ENABLE_DEBUG BOOL true
;; ;;
--enable-release)
append_cache_entry ENABLE_RELEASE BOOL true
;;
--enable-brov6) --enable-brov6)
append_cache_entry BROv6 BOOL true append_cache_entry BROv6 BOOL true
;; ;;