Skip to content

Commit 0d1959f

Browse files
committed
cmake: some option renamed to match the autotols version
Signed-off-by: Hofi <hofione@gmail.com>
1 parent 8023a97 commit 0d1959f

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

CMakeLists.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ set(SYSLOG_NG_ENABLE_ENV_WRAPPER ${ENABLE_ENV_WRAPPER})
156156

157157
# NOTE: This is now seems to be an Apple/Xcode "only" issue, but probably much better a clang one, so later we might want to add this globally
158158
if (APPLE)
159-
option(FORCE_CLASSIC_LINKING "Enable classic linking" OFF)
160-
if (FORCE_CLASSIC_LINKING)
159+
option(ENABLE_CLASSIC_LINKING "Enable classic linking" OFF)
160+
if (ENABLE_CLASSIC_LINKING)
161161
# XCode15 new linker has some issues (e.g. https://developer.apple.com/forums/thread/737707)
162162
# switch back to classic linking till not fixed (https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#Linking)
163163
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-ld_classic")
@@ -368,21 +368,21 @@ endif ()
368368
set (ENABLE_PERF OFF)
369369
set (SYSLOG_NG_ENABLE_PERF ${ENABLE_PERF})
370370

371-
option (ENABLE_LIBUNWIND "Enable stackdump using libunwind" OFF)
372-
if (ENABLE_LIBUNWIND)
371+
option(ENABLE_STACKDUMP "Enable stackdump using libunwind" OFF)
372+
if (ENABLE_STACKDUMP)
373373
if (NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
374-
message (FATAL_ERROR "ENABLE_LIBUNWIND is defined, but it is only supported on Linux currently.")
374+
message (FATAL_ERROR "ENABLE_STACKDUMP is defined, but it is only supported on Linux currently.")
375375
endif ()
376376
find_package (LIBUNWIND)
377377
if (NOT LIBUNWIND_FOUND)
378-
message (FATAL_ERROR "ENABLE_LIBUNWIND is defined, but the libunwind library could not be found.")
378+
message (FATAL_ERROR "ENABLE_STACKDUMP is defined, but the libunwind library could not be found.")
379379
endif ()
380380
set (CMAKE_REQUIRED_INCLUDES ${LIBUNWIND_INCLUDE_DIR})
381381
if (NOT APPLE)
382382
set (CMAKE_REQUIRED_LIBRARIES ${LIBUNWIND_LIBRARY})
383383
endif ()
384384
endif ()
385-
set (SYSLOG_NG_ENABLE_STACKDUMP ${ENABLE_LIBUNWIND})
385+
set (SYSLOG_NG_ENABLE_STACKDUMP ${ENABLE_STACKDUMP})
386386

387387
if (WITH_GETTEXT)
388388
set(CMAKE_PREFIX_PATH ${WITH_GETTEXT})

cmake/print_config_summary.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ function(print_config_summary)
210210
_print_compilers_info("${_variableNames}" "${_compilersInfo}")
211211

212212
_print_separator("Compilation")
213-
list(APPEND _compilationOptions "CMAKE_BUILD_TYPE" "^ENABLE_CPP" "ENABLE_EXTRA_WARNINGS" "ENABLE_FORCE_GNU99" "ENV_LD_LIBRARY_PATH")
213+
list(APPEND _compilationOptions "CMAKE_BUILD_TYPE" "^ENABLE_CPP" "^ENABLE_EXTRA_WARNINGS" "^ENABLE_FORCE_GNU99" "^ENABLE_GCOV" "^ENABLE_GPROF" "^ENABLE_MEMTRACE" "^ENABLE_PERF" "^ENABLE_STACKDUMP" "SANITIZER" "ENV_LD_LIBRARY_PATH")
214214
if(APPLE)
215-
list(APPEND _compilationOptions "FORCE_CLASSIC_LINKING")
215+
list(APPEND _compilationOptions "ENABLE_CLASSIC_LINKING")
216216
endif()
217217
_print_options("${_variableNames}" "${_compilationOptions}")
218218

@@ -228,7 +228,7 @@ function(print_config_summary)
228228
_get_matching_options(_evaluatedFeaturesOptions "${_variableNames}" "^SYSLOG_NG_ENABLE_")
229229

230230
_print_separator ("Features")
231-
list(APPEND _featuresExcludeOptions "ENABLE_DEBUG" "ENABLE_CPP" "ENABLE_AFSOCKET_MEMINFO_METRICS")
231+
list(APPEND _featuresExcludeOptions "ENABLE_DEBUG" "ENABLE_CPP" "ENABLE_AFSOCKET_MEMINFO_METRICS" "ENABLE_GCOV" "ENABLE_GPROF" "ENABLE_MEMTRACE" "ENABLE_PERF" "ENABLE_STACKDUMP")
232232
_get_feature_list(_featuresOptions "${_evaluatedFeaturesOptions}" "${_featuresExcludeOptions}")
233233
_print_options("${_featuresOptions}" "")
234234

0 commit comments

Comments
 (0)