CMake: Allow user build flags to override default build flags

Autotools has the very useful feature by design of allowing the user
to override the default build flags (you break it you keep it).

Apparently CMake applies COMPILE_OPTIONS target property after
CMAKE_{C,CXX}_FLAGS so that doesn't work here. Prepend our flags to those
variables instead to make it work then.

Specific target flag overrides can still be added with COMPILER_OPTIONS
(e.g: generated files with -Wno-warning) but this is less effective and
then we're back at the point where this overrides user flags. It's less
of a concern though.

Change-Id: I44761a79be4289238e02d4e781fef0099628817b
Reviewed-on: https://code.wireshark.org/review/23675
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

20 files changed, 42 insertions, 57 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7bafe80dec..9ceeaf4520 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -693,10 +693,10 @@ foreach(THIS_FLAG ${C_WARN_TESTS})
 	message(STATUS "Checking for c-compiler flag: ${THIS_FLAG}")
 	check_c_compiler_flag("${C_FLAG_TESTS} ${${F}}" ${V})
 	if (${${V}})
-		set(ADDED_WARN_C_FLAGS ${ADDED_WARN_C_FLAGS} ${${F}})
+		set(ADDED_WARN_C_FLAGS "${ADDED_WARN_C_FLAGS} ${${F}}")
 	endif()
 endforeach()
-set(WS_WARNINGS_C_FLAGS ${ADDED_WARN_C_FLAGS})
+set(CMAKE_C_FLAGS "${ADDED_WARN_C_FLAGS} ${CMAKE_C_FLAGS}")
 
 foreach(THIS_FLAG ${CXX_WARN_TESTS})
 	string( REGEX REPLACE "[^a-zA-Z0-9_]+" "_" F ${THIS_FLAG} )
@@ -705,10 +705,10 @@ foreach(THIS_FLAG ${CXX_WARN_TESTS})
 	message(STATUS "Checking for c++-compiler flag: ${THIS_FLAG}")
 	check_cxx_compiler_flag("${CXX_FLAG_TESTS} ${${F}}" ${V})
 	if (${${V}})
-		set(ADDED_WARN_CXX_FLAGS ${ADDED_WARN_CXX_FLAGS} ${${F}})
+		set(ADDED_WARN_CXX_FLAGS "${ADDED_WARN_CXX_FLAGS} ${${F}}")
 	endif()
 endforeach()
-set(WS_WARNINGS_CXX_FLAGS ${ADDED_WARN_CXX_FLAGS})
+set(CMAKE_CXX_FLAGS "${ADDED_WARN_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
 
 include(CMakePushCheckState)
 
@@ -773,14 +773,14 @@ if( NOT CMAKE_C_COMPILER_ID MATCHES "MSVC")
 	#
 	check_c_compiler_flag(-fvisibility=hidden FVHIDDEN)
 	if(FVHIDDEN)
-		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
+		set(CMAKE_C_FLAGS "-fvisibility=hidden ${CMAKE_C_FLAGS}")
 	else()
 		#
 		# OK, try the Sun^WOracle C -xldscope=hidden
 		#
 		check_c_compiler_flag(-xldscope=hidden XLDSCOPEHIDDEN)
 		if(XLDSCOPEHIDDEN)
-			set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -xldscope=hidden")
+			set(CMAKE_C_FLAGS "-xldscope=hidden ${CMAKE_C_FLAGS}")
 		else()
 			#
 			# Anything else?
@@ -1203,9 +1203,9 @@ if (Qt5Widgets_FOUND)
 		if(NOT CXX__std_c__11_VALID)
 			message(FATAL_ERROR "Qt ${Qt5Widgets_VERSION} requires C++ 11")
 		endif()
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+		set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
 	endif()
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+	set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS} ${CMAKE_CXX_FLAGS}")
 	set (QT_FOUND ON)
 	set (QT_LIBRARIES ${Qt5Widgets_LIBRARIES} ${Qt5PrintSupport_LIBRARIES})
 	if(Qt5Multimedia_FOUND)
@@ -1550,10 +1550,8 @@ set_package_properties(NGHTTP2 PROPERTIES
 	PURPOSE "Header decompression in HTTP2"
 )
 
-string(REPLACE ";" " " _warnings_c_flags "${WS_WARNINGS_C_FLAGS}")
-message(STATUS "C-Flags: ${CMAKE_C_FLAGS} ${_warnings_c_flags}")
-string(REPLACE ";" " " _warnings_cxx_flags "${WS_WARNINGS_CXX_FLAGS}")
-message(STATUS "CXX-Flags: ${CMAKE_CXX_FLAGS} ${_warnings_cxx_flags}")
+message(STATUS "C-Flags: ${CMAKE_C_FLAGS}")
+message(STATUS "CXX-Flags: ${CMAKE_CXX_FLAGS}")
 message(STATUS "Warnings as errors: ${WERROR_COMMON_FLAGS}")
 
 feature_summary(WHAT ALL)
@@ -2213,9 +2211,10 @@ if(BUILD_wireshark AND QT_FOUND)
 	add_executable(wireshark WIN32 MACOSX_BUNDLE wireshark-qt.cpp ${wireshark_FILES} ${EXTRA_BUNDLE_FILES})
 	add_dependencies(wireshark version)
 	set(PROGLIST ${PROGLIST} wireshark)
-	set_target_properties(wireshark PROPERTIES COMPILE_OPTIONS "${WS_WARNINGS_CXX_FLAGS}")
-	set_target_properties(wireshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-	set_target_properties(wireshark PROPERTIES FOLDER "Executables")
+	set_target_properties(wireshark PROPERTIES
+		LINK_FLAGS "${WS_LINK_FLAGS}"
+		FOLDER "Executables"
+	)
 	if(ENABLE_APPLICATION_BUNDLE OR WIN32)
 		set_target_properties(wireshark PROPERTIES OUTPUT_NAME Wireshark)
 	endif()
@@ -2293,7 +2292,6 @@ endif()
 # Common properties for CLI executables
 macro(set_extra_executable_properties _executable _folder)
 	set_target_properties(${_executable} PROPERTIES
-		COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 		LINK_FLAGS "${WS_LINK_FLAGS}"
 		FOLDER ${_folder}
 	)
@@ -2321,7 +2319,6 @@ macro(set_extcap_executable_properties _executable)
 
 	if(WIN32)
 		set_target_properties(${_executable} PROPERTIES
-			COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 			LINK_FLAGS "${WS_LINK_FLAGS}"
 			RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/extcap
 			RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/run/Debug/extcap
@@ -2331,7 +2328,6 @@ macro(set_extcap_executable_properties _executable)
 		)
 	else()
 		set_target_properties(${_executable} PROPERTIES
-			COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 			LINK_FLAGS "${WS_LINK_FLAGS}"
 			RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/extcap
 		)
@@ -2373,9 +2369,10 @@ if(BUILD_wireshark_gtk AND GTK_FOUND)
 	add_executable(wireshark-gtk WIN32 ${wireshark_FILES})
 	add_dependencies(wireshark-gtk version)
 	set(PROGLIST ${PROGLIST} wireshark-gtk)
-	set_target_properties(wireshark-gtk PROPERTIES COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}")
-	set_target_properties(wireshark-gtk PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-	set_target_properties(wireshark-gtk PROPERTIES FOLDER "Executables")
+	set_target_properties(wireshark-gtk PROPERTIES
+		LINK_FLAGS "${WS_LINK_FLAGS}"
+		FOLDER "Executables"
+	)
 	target_link_libraries(wireshark-gtk ${wireshark_gtk_LIBS})
 	install(TARGETS wireshark-gtk RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
diff --git a/capchild/CMakeLists.txt b/capchild/CMakeLists.txt
index b470a4db08..1a71b4f6a8 100644
--- a/capchild/CMakeLists.txt
+++ b/capchild/CMakeLists.txt
@@ -43,7 +43,6 @@ add_library(capchild STATIC
 )
 
 set_target_properties(capchild PROPERTIES
-	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 	LINK_FLAGS "${WS_LINK_FLAGS}"
 	FOLDER "Libs")
 
diff --git a/caputils/CMakeLists.txt b/caputils/CMakeLists.txt
index 4536601495..ec0c6a7c47 100644
--- a/caputils/CMakeLists.txt
+++ b/caputils/CMakeLists.txt
@@ -64,7 +64,6 @@ add_library(caputils STATIC
 )
 
 set_target_properties(caputils PROPERTIES
-	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 	LINK_FLAGS "${WS_LINK_FLAGS}"
 	FOLDER "Libs")
 
diff --git a/cmake/modules/WiresharkPlugin.cmake b/cmake/modules/WiresharkPlugin.cmake
index 04b11377f2..488175fca6 100644
--- a/cmake/modules/WiresharkPlugin.cmake
+++ b/cmake/modules/WiresharkPlugin.cmake
@@ -33,7 +33,6 @@ macro(ADD_PLUGIN_LIBRARY _plugin)
 
 	set_target_properties(${_plugin} PROPERTIES
 		PREFIX ""
-		COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 		LINK_FLAGS "${WS_LINK_FLAGS}"
 		FOLDER "Plugins"
 	)
diff --git a/codecs/CMakeLists.txt b/codecs/CMakeLists.txt
index ba2e263505..6f7f51cb4c 100644
--- a/codecs/CMakeLists.txt
+++ b/codecs/CMakeLists.txt
@@ -71,7 +71,6 @@ set(FULL_SO_VERSION "0.0.0")
 set_target_properties(wscodecs PROPERTIES
   PREFIX "lib"
   COMPILE_DEFINITIONS "WS_BUILD_DLL"
-  COMPILE_OPTIONS "${WS_WS_WARNINGS_C_FLAGS}"
   LINK_FLAGS "${WS_LINK_FLAGS}"
   VERSION ${FULL_SO_VERSION} SOVERSION 0
   FOLDER "DLLs"
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index adadd689e5..b5d1d2a20b 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -357,10 +357,11 @@ add_dependencies(epan version)
 
 set(FULL_SO_VERSION "0.0.0")
 
-set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL")
-set_target_properties(epan PROPERTIES COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}")
-set_target_properties(epan PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(epan PROPERTIES VERSION ${FULL_SO_VERSION} SOVERSION 0)
+set_target_properties(epan PROPERTIES
+	COMPILE_DEFINITIONS "WS_BUILD_DLL"
+	LINK_FLAGS "${WS_LINK_FLAGS}"
+	VERSION ${FULL_SO_VERSION} SOVERSION 0
+)
 
 if(ENABLE_APPLICATION_BUNDLE)
 	set_target_properties(epan PROPERTIES
@@ -444,7 +445,6 @@ target_link_libraries(exntest ${GLIB2_LIBRARIES})
 set_target_properties(exntest PROPERTIES
 	FOLDER "Tests"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
-	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 )
 
 add_executable(oids_test EXCLUDE_FROM_ALL oids_test.c)
@@ -452,7 +452,6 @@ target_link_libraries(oids_test epan ${ZLIB_LIBRARIES})
 set_target_properties(oids_test PROPERTIES
 	FOLDER "Tests"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
-	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 )
 
 add_executable(reassemble_test EXCLUDE_FROM_ALL reassemble_test.c)
@@ -466,7 +465,6 @@ target_link_libraries(tvbtest epan)
 set_target_properties(tvbtest PROPERTIES
 	FOLDER "Tests"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
-	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 )
 
 CHECKAPI(
diff --git a/epan/crypt/CMakeLists.txt b/epan/crypt/CMakeLists.txt
index a06aa60482..b76188f406 100644
--- a/epan/crypt/CMakeLists.txt
+++ b/epan/crypt/CMakeLists.txt
@@ -48,7 +48,6 @@ add_library(crypt OBJECT
 set_target_properties(crypt PROPERTIES
 	FOLDER "Libs/epan/crypt"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
-	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 )
 
 CHECKAPI(
diff --git a/epan/dfilter/CMakeLists.txt b/epan/dfilter/CMakeLists.txt
index 4a2ebad0f9..3f60b771f7 100644
--- a/epan/dfilter/CMakeLists.txt
+++ b/epan/dfilter/CMakeLists.txt
@@ -70,7 +70,6 @@ add_library(dfilter OBJECT
 set_target_properties(dfilter PROPERTIES
 	FOLDER "Libs/epan/dfilter"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
-	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 )
 
 if(NOT WIN32)
diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt
index 0b5c5921a2..1aa7b85426 100644
--- a/epan/dissectors/CMakeLists.txt
+++ b/epan/dissectors/CMakeLists.txt
@@ -196,7 +196,6 @@ add_library(dissectors-corba OBJECT
 set_target_properties(dissectors-corba PROPERTIES
 	FOLDER "Libs/epan/dissectors"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
-	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 )
 
 if(WIN32 AND "${CMAKE_GENERATOR}" STREQUAL "Visual Studio 12 2013 Win64")
@@ -1857,7 +1856,6 @@ add_library(dissectors OBJECT
 set_target_properties(dissectors PROPERTIES
 	FOLDER "Libs/epan/dissectors"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
-	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 )
 
 if(NOT WIN32)
diff --git a/epan/ftypes/CMakeLists.txt b/epan/ftypes/CMakeLists.txt
index 1ca5e213ee..fb9bac2fd5 100644
--- a/epan/ftypes/CMakeLists.txt
+++ b/epan/ftypes/CMakeLists.txt
@@ -58,7 +58,6 @@ add_library(ftypes OBJECT
 set_target_properties(ftypes PROPERTIES
 	FOLDER "Libs/epan/ftypes"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
-	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 )
 
 if(NOT WIN32)
diff --git a/epan/wmem/CMakeLists.txt b/epan/wmem/CMakeLists.txt
index 87a077472d..710f023f74 100644
--- a/epan/wmem/CMakeLists.txt
+++ b/epan/wmem/CMakeLists.txt
@@ -74,7 +74,6 @@ add_library(wmem OBJECT
 set_target_properties(wmem PROPERTIES
 	FOLDER "Libs/epan/wmem"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
-	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 )
 
 add_executable(wmem_test EXCLUDE_FROM_ALL wmem_test.c $<TARGET_OBJECTS:wmem>)
@@ -84,7 +83,6 @@ target_link_libraries(wmem_test ${GLIB2_LIBRARIES} wsutil)
 set_target_properties(wmem_test PROPERTIES
 	FOLDER "Tests"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
-	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 )
 
 if(NOT WIN32)
diff --git a/epan/wslua/CMakeLists.txt b/epan/wslua/CMakeLists.txt
index 473558d709..b32eaa0269 100644
--- a/epan/wslua/CMakeLists.txt
+++ b/epan/wslua/CMakeLists.txt
@@ -160,7 +160,6 @@ add_library(wslua OBJECT
 set_target_properties(wslua PROPERTIES
 	FOLDER "Libs/epan/wslua"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
-	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 )
 
 CHECKAPI(
diff --git a/randpkt_core/CMakeLists.txt b/randpkt_core/CMakeLists.txt
index dc88b07e55..f7d5069e8d 100644
--- a/randpkt_core/CMakeLists.txt
+++ b/randpkt_core/CMakeLists.txt
@@ -41,7 +41,6 @@ add_library(randpkt_core STATIC
 )
 
 set_target_properties(randpkt_core PROPERTIES
-	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 	LINK_FLAGS "${WS_LINK_FLAGS}"
 	FOLDER "Libs")
 
diff --git a/tools/lemon/CMakeLists.txt b/tools/lemon/CMakeLists.txt
index 43a8e9d41b..a598e820b6 100644
--- a/tools/lemon/CMakeLists.txt
+++ b/tools/lemon/CMakeLists.txt
@@ -38,9 +38,11 @@ set(lemon_LIBS
 )
 
 add_executable(lemon ${lemon_FILES})
-set_target_properties(lemon PROPERTIES FOLDER "tools")
-set_target_properties(lemon PROPERTIES COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}")
-set_target_properties(lemon PROPERTIES LINK_FLAGS "${NO_SANITIZE_LDFLAGS}")
+
+set_target_properties(lemon PROPERTIES
+	FOLDER "tools"
+	LINK_FLAGS "${NO_SANITIZE_LDFLAGS}"
+)
 
 target_link_libraries(lemon ${lemon_LIBS})
 
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 7c7ac38792..275c8eda43 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -92,9 +92,10 @@ add_library(ui STATIC
 	${GENERATED_FILES}
 )
 
-set_target_properties(ui PROPERTIES COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}")
-set_target_properties(ui PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(ui PROPERTIES FOLDER "UI")
+set_target_properties(ui PROPERTIES
+	LINK_FLAGS "${WS_LINK_FLAGS}"
+	FOLDER "UI"
+)
 
 CHECKAPI(
 	NAME
diff --git a/ui/gtk/CMakeLists.txt b/ui/gtk/CMakeLists.txt
index b64973da5a..381fa528e1 100644
--- a/ui/gtk/CMakeLists.txt
+++ b/ui/gtk/CMakeLists.txt
@@ -315,9 +315,9 @@ add_library(gtkui STATIC
 	${PIXBUF_SRC}
 )
 set_target_properties(gtkui PROPERTIES
-	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 	LINK_FLAGS "${WS_LINK_FLAGS}"
-	FOLDER "UI")
+	FOLDER "UI"
+)
 
 CHECKAPI(
 	NAME
diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
index 3822e050f0..22e7702f58 100644
--- a/ui/qt/CMakeLists.txt
+++ b/ui/qt/CMakeLists.txt
@@ -617,9 +617,10 @@ add_library(qtui STATIC
 	wireshark-tap-register.c
 )
 add_dependencies(qtui translations)
-set_target_properties(qtui PROPERTIES COMPILE_OPTIONS "${WS_WARNINGS_CXX_FLAGS}")
-set_target_properties(qtui PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
-set_target_properties(qtui PROPERTIES FOLDER "UI")
+set_target_properties(qtui PROPERTIES
+	LINK_FLAGS "${WS_LINK_FLAGS}"
+	FOLDER "UI"
+)
 
 #
 # Editor modelines  -  http://www.wireshark.org/tools/modelines.html
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 20a41de355..c04afb3ced 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -128,7 +128,6 @@ set(FULL_SO_VERSION "0.0.0")
 set_target_properties(wiretap PROPERTIES
 	PREFIX "lib"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
-	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 	LINK_FLAGS "${WS_LINK_FLAGS}"
 	VERSION ${FULL_SO_VERSION} SOVERSION 0
 	FOLDER "DLLs"
diff --git a/writecap/CMakeLists.txt b/writecap/CMakeLists.txt
index 42483f93af..8d6ce4b88f 100644
--- a/writecap/CMakeLists.txt
+++ b/writecap/CMakeLists.txt
@@ -39,9 +39,9 @@ add_library(writecap STATIC
 )
 
 set_target_properties(writecap PROPERTIES
-	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 	LINK_FLAGS "${WS_LINK_FLAGS}"
-	FOLDER "Libs")
+	FOLDER "Libs"
+)
 
 #
 # Editor modelines  -  http://www.wireshark.org/tools/modelines.html
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index 43a574d678..4f117a757a 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -276,10 +276,10 @@ set(FULL_SO_VERSION "0.0.0")
 set_target_properties(wsutil PROPERTIES
 	PREFIX "lib"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
-	COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
 	LINK_FLAGS "${WS_LINK_FLAGS}"
 	VERSION ${FULL_SO_VERSION} SOVERSION 0
-	FOLDER "DLLs")
+	FOLDER "DLLs"
+)
 
 if(ENABLE_APPLICATION_BUNDLE)
 	set_target_properties(wsutil PROPERTIES