column-utils: add space to improve readability.

[metze/wireshark/wip.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 988ca8577e66b045f70b52f930d6f647b5b50219..667fee4bc74a793d9acf3414f46572a491c07f5a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -593,6 +593,12 @@ if(ENABLE_ASAN)
        endif()
        set(CMAKE_C_FLAGS "-fsanitize=address ${CMAKE_C_FLAGS}")
        set(CMAKE_CXX_FLAGS "-fsanitize=address ${CMAKE_CXX_FLAGS}")
+       # Disable ASAN for build-time tools, e.g. lemon
+       check_c_compiler_flag(-fno-sanitize=all C__fno_sanitize_all_VALID)
+       if(C__fno_sanitize_all_VALID)
+               set(NO_SANITIZE_CFLAGS "-fno-sanitize=all")
+               set(NO_SANITIZE_LDFLAGS "-fno-sanitize=all")
+       endif()
 endif()
 
 set(WERROR_COMMON_FLAGS "")
@@ -1828,13 +1834,11 @@ if(ENABLE_APPLICATION_BUNDLE)
        )
 
        # Wireshark.app/Contents/Resources/share/man/man1
-       set(BUNDLE_RESOURCE_SHARE_MAN1_FILES ${MAN1_FILES})
        set_source_files_properties(${BUNDLE_RESOURCE_SHARE_MAN1_FILES} PROPERTIES
                MACOSX_PACKAGE_LOCATION Resources/share/man/man1
        )
 
        # Wireshark.app/Contents/Resources/share/man/man1
-       set(BUNDLE_RESOURCE_SHARE_MAN4_FILES ${MAN4_FILES})
        set_source_files_properties(${BUNDLE_RESOURCE_SHARE_MAN4_FILES} PROPERTIES
                MACOSX_PACKAGE_LOCATION Resources/share/man/man4
        )