column-utils: add space to improve readability.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ff841510682b817cc0ba192d11bcfcfbc4951a3..667fee4bc74a793d9acf3414f46572a491c07f5a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -593,12 +593,19 @@ 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 "")
+set(NO_ERROR_DEPRECATED_DECLARATIONS_COMPILE_FLAGS "")
 if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_COMPILER_WARNINGS)
        if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
                set(WERROR_COMMON_FLAGS "/WX")
-               set(NO_ERROR_DEPRECATED_DECLARATIONS_COMPILE_FLAGS)
        else()
                check_c_compiler_flag(-Werror WERROR)
                if (WERROR)
@@ -606,8 +613,6 @@ if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_COMPILER_WARNINGS)
                        set(NO_ERROR_DEPRECATED_DECLARATIONS_COMPILE_FLAGS "-Wno-error=deprecated-declarations")
                endif()
        endif()
-else()
-       set(WERROR_COMMON_FLAGS FALSE)
 endif()
 
 #
@@ -1829,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
        )
@@ -2620,13 +2623,11 @@ set(CLEAN_FILES
        ${udpdump_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 install(
        FILES
@@ -2769,6 +2770,25 @@ CHECKAPI(
          ${TSHARK_TAP_SRC}
 )
 
+find_program(SHELLCHECK_EXECUTABLE shellcheck
+       DOC "Path to the shellcheck utility."
+)
+if (NOT "${SHELLCHECK_EXECUTABLE}" STREQUAL "SHELLCHECK_EXECUTABLE-NOTFOUND")
+       add_custom_target(shellcheck)
+       set_target_properties(shellcheck PROPERTIES FOLDER "Tests")
+       # --external-sources requires 0.4.0 or later.
+       add_custom_command(TARGET shellcheck POST_BUILD
+               COMMAND shellcheck --external-sources
+                       tools/fuzz-test.sh
+                       tools/randpkt-test.sh
+                       tools/runa2x.sh
+                       tools/test-captures.sh
+                       tools/valgrind-wireshark.sh
+               WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+       )
+endif()
+
+
 #
 # Editor modelines  -  http://www.wireshark.org/tools/modelines.html
 #