@@ -156,8 +156,8 @@ set(SYSLOG_NG_ENABLE_ENV_WRAPPER ${ENABLE_ENV_WRAPPER})
156
156
157
157
# 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
158
158
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 )
161
161
# XCode15 new linker has some issues (e.g. https://developer.apple.com/forums/thread/737707)
162
162
# switch back to classic linking till not fixed (https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#Linking)
163
163
SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-ld_classic" )
@@ -368,21 +368,21 @@ endif ()
368
368
set (ENABLE_PERF OFF )
369
369
set (SYSLOG_NG_ENABLE_PERF ${ENABLE_PERF} )
370
370
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 )
373
373
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." )
375
375
endif ()
376
376
find_package (LIBUNWIND)
377
377
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." )
379
379
endif ()
380
380
set (CMAKE_REQUIRED_INCLUDES ${LIBUNWIND_INCLUDE_DIR} )
381
381
if (NOT APPLE )
382
382
set (CMAKE_REQUIRED_LIBRARIES ${LIBUNWIND_LIBRARY} )
383
383
endif ()
384
384
endif ()
385
- set (SYSLOG_NG_ENABLE_STACKDUMP ${ENABLE_LIBUNWIND } )
385
+ set (SYSLOG_NG_ENABLE_STACKDUMP ${ENABLE_STACKDUMP } )
386
386
387
387
if (WITH_GETTEXT)
388
388
set (CMAKE_PREFIX_PATH ${WITH_GETTEXT} )
0 commit comments