Merge pull request #9 from jfsmig/JFS-default-socket

cmake: fixed gcc version detection
open-io · Oct 20, 2015 · 3cdbfcc · 3cdbfcc
2 parents 6a79f5e + 079e023
commit 3cdbfcc
Showing 1 changed file with 20 additions and 32 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,31 +21,25 @@ set(CMAKE_C_FLAGS "-g -Wall -Wextra -Wunused -pipe -std=gnu99")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
 
 if (CMAKE_COMPILER_IS_GNUCC)
-    MESSAGE("GCC!")
-    EXEC_PROGRAM(gcc ARGS --version OUTPUT_VARIABLE CMAKE_C_COMPILER_VERSION)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-variadic-macros")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wsequence-point")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wredundant-decls")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
-	if(CMAKE_C_COMPILER_VERSION MATCHES " [4-9]\\.[4-9]\\.[0-9]+")
-        MESSAGE("GCC >= 4.4")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcomment")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmain")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wparentheses")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wfloat-equal")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunsafe-loop-optimizations")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused-but-set-parameter")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused-but-set-variable")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wframe-larger-than=8192")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -finline-limit=8192")
-		if(CMAKE_C_COMPILER_VERSION MATCHES " [4-9]\\.[6-9]\\.[0-9]+")
-			MESSAGE("GCC '${CMAKE_C_COMPILER_VERSION}' >= 4.6")
-			set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes")
-			#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Winline")
-			#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wconversion")
-			#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wswitch-enum")
-		endif()
-    endif()
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-variadic-macros")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wsequence-point")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wredundant-decls")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
+
+	# gcc >= 4.2
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wcomment")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmain")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wparentheses")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wfloat-equal")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunsafe-loop-optimizations")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused-but-set-parameter")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused-but-set-variable")
+
+	# gcc >= 4.6
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-prototypes")
+	#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Winline")
+	#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wconversion")
+	#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wswitch-enum")
 endif()
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
@@ -86,15 +80,12 @@ else()
 	MESSAGE("LD_LIBDIR guessed to ${LD_LIBDIR}")
 endif()
 
-###-------------------------------------------------------------------------###
 
 find_package(PkgConfig)
 pkg_check_modules(GLIB2 REQUIRED glib-2.0 gthread-2.0 gmodule-2.0)
 pkg_check_modules(LIBEVENT REQUIRED libevent)
 
-###------------------------------------------------###
 ### explicit plugin directory for alerting modules ###
-###------------------------------------------------###
 
 set(GRIDINIT_PLUGINS_DIRECTORY "${LD_LIBDIR}/gridinit")
 if(GRIDINIT_PLUGINS)
@@ -103,10 +94,7 @@ endif(GRIDINIT_PLUGINS)
 
 set(CMAKE_LIBRARY_PATH "")
 set(CMAKE_INCLUDE_PATH "")
-include_directories(AFTER
-		${GLIB2_INCLUDE_DIRS})
-
-###-------------------------------------------------------------------------###
+include_directories(AFTER ${GLIB2_INCLUDE_DIRS})
 
 add_subdirectory(./lib)
 add_subdirectory(./main)