diff options
author | Peter Wu <peter@lekensteyn.nl> | 2016-09-30 16:06:15 +0200 |
---|---|---|
committer | Dario Lombardo <lomato@gmail.com> | 2016-09-30 20:08:02 +0000 |
commit | 534787e402d6aa8b349638f911a2a65b013c6594 (patch) | |
tree | 9cfaeb38a16eab0fee86b3b0fb8f9245c7813f7a /wsutil | |
parent | 53c91974c7e8f77555920e137cab80b5418e992b (diff) | |
download | wireshark-534787e402d6aa8b349638f911a2a65b013c6594.tar.gz |
cmake: make WERROR_COMMON_FLAGS a normal string
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 <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>
Diffstat (limited to 'wsutil')
-rw-r--r-- | wsutil/CMakeLists.txt | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index 2f71d0fc72..539126df04 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -189,33 +189,18 @@ set(CLEAN_FILES ${WSUTIL_FILES} ) -if (WERROR_COMMON_FLAGS) - set_source_files_properties( - ${CLEAN_FILES} - PROPERTIES - COMPILE_FLAGS ${WERROR_COMMON_FLAGS} - ) -else() - # - # Set the property to an empty string, so that if we try - # to get it below, it succeeds. - # - set_source_files_properties( - ${CLEAN_FILES} - PROPERTIES - COMPILE_FLAGS "" - ) -endif() +set_source_files_properties( + ${CLEAN_FILES} + PROPERTIES + COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" +) if (HAVE_SSE4_2) - get_source_file_property( - WS_MEMPBRK_SSE42_COMPILE_FLAGS - ws_mempbrk_sse42.c - COMPILE_FLAGS - ) + # TODO with CMake 2.8.12, we could use COMPILE_OPTIONS and just append + # instead of this COMPILE_FLAGS duplication... set_source_files_properties( ws_mempbrk_sse42.c PROPERTIES - COMPILE_FLAGS "${WS_MEMPBRK_SSE42_COMPILE_FLAGS} ${SSE4_2_FLAG}" + COMPILE_FLAGS "${WERROR_COMMON_FLAGS} ${SSE4_2_FLAG}" ) endif() |