Simplify the addition of compiler flags and do not rely on non-recommended CMake variable

1 files changed, 11 insertions, 11 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 884d1e561..1db62c570 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -826,17 +826,17 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in"
 #                        functions implementing the interface of a plugin.
 # -Wno-sign-compare: We currently just use int almost everywhere.
 #                    Unclear if it's really worth correcting.
-if(CMAKE_COMPILER_IS_GNUCC OR CCMAKE_COMPILER_IS_GNUCXX)
-	set(COMMON_COMPILER_FLAGS "-Wall -Wundef -Wcast-align -Wpointer-arith -Wno-unused-parameter -Wno-sign-compare")
-	set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} ${COMMON_COMPILER_FLAGS}")
-	set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${COMMON_COMPILER_FLAGS}")
-	# flags not available in old GCC versions, or not for both C and C++
-	add_compiler_flag_if_available("-Wno-missing-field-initializers")
-	add_compiler_flag_if_available("-Wextra")
-	add_compiler_flag_if_available("-Wmissing-prototypes")
-	add_compiler_flag_if_available("-Wstrict-prototypes")
-	add_compiler_flag_if_available("-Wformat-security")
-endif()
+add_compiler_flag_if_available("-Wall")
+add_compiler_flag_if_available("-Wno-unused-parameter")
+add_compiler_flag_if_available("-Wno-sign-compare")
+add_compiler_flag_if_available("-Wno-missing-field-initializers")
+add_compiler_flag_if_available("-Wundef")
+add_compiler_flag_if_available("-Wcast-align")
+add_compiler_flag_if_available("-Wpointer-arith")
+add_compiler_flag_if_available("-Wextra")
+add_compiler_flag_if_available("-Wmissing-prototypes")
+add_compiler_flag_if_available("-Wstrict-prototypes")
+add_compiler_flag_if_available("-Wformat-security")
 add_compiler_flag_if_available("-Werror=format-security")
 add_compiler_flag_if_available("-fstack-protector-strong")
 add_compiler_flag_if_available("-D_FORTIFY_SOURCE=2")