From 534787e402d6aa8b349638f911a2a65b013c6594 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Fri, 30 Sep 2016 16:06:15 +0200 Subject: cmake: make WERROR_COMMON_FLAGS a normal string MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of checking for the boolean "FALSE", just set an empty string. This avoids the need to check for WERROR_COMMON_FLAGS before using it. The transformation is the same for all files, remove "if (WERROR_COMMON_FLAGS)" and "endif()", reindent and add quotes (since we have a string here and not a list). Modelines have been added where missing. Change-Id: I0ab05ae507c51fa77336d49a99a226399cc81b92 Reviewed-on: https://code.wireshark.org/review/17997 Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde Reviewed-by: Dario Lombardo Tested-by: Dario Lombardo --- capchild/CMakeLists.txt | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'capchild/CMakeLists.txt') diff --git a/capchild/CMakeLists.txt b/capchild/CMakeLists.txt index af51706305..b470a4db08 100644 --- a/capchild/CMakeLists.txt +++ b/capchild/CMakeLists.txt @@ -30,13 +30,11 @@ set(CLEAN_FILES ${CAPCHILD_SRC} ) -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}" +) file(GLOB CAPCHILD_HEADERS capture_session.h) @@ -66,3 +64,16 @@ CHECKAPI( SOURCES ${CAPCHILD_SRC} ) + +# +# Editor modelines - http://www.wireshark.org/tools/modelines.html +# +# Local variables: +# c-basic-offset: 8 +# tab-width: 8 +# indent-tabs-mode: t +# End: +# +# vi: set shiftwidth=8 tabstop=8 noexpandtab: +# :indentSize=8:tabSize=8:noTabs=false: +# -- cgit v1.2.3