prefer std=gnu++0x on msw so wx does not fail

renefritze · Dec 10, 2012 · 38a8f9d · 38a8f9d
1 parent 213a3d0
commit 38a8f9d
Showing 1 changed file with 28 additions and 23 deletions.
diff --git a/cmake/compat_flags.cmake b/cmake/compat_flags.cmake
@@ -4,29 +4,34 @@ execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
 
 # try to use compiler flag -std=c++11
 include(TestCXXAcceptsFlag)
-CHECK_CXX_ACCEPTS_FLAG("-std=c++11" CXX_FLAG_CXX11)
-if(CXX_FLAG_CXX11)
-	set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++11")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ")
-	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11 ")
-	set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -std=c++11 ")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++11 ")
-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -std=c++11 ")
-	set(CXX_STD0X_FLAGS "-std=c++11")
-else()
-	# try to use compiler flag -std=c++0x for older compilers
-	CHECK_CXX_ACCEPTS_FLAG("-std=c++0x" CXX_FLAG_CXX0X)
-	if(CXX_FLAG_CXX0X)
-		set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++0x" )
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x ")
-		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++0x ")
-		set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -std=c++0x ")
-		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -std=c++0x ")
-		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -std=c++0x ")
-	set(CXX_STD0X_FLAGS "-std=c++0x")
-	endif(CXX_FLAG_CXX0X)
-endif(CXX_FLAG_CXX11)
+MACRO(AddSTDFlag FLAG)
+	set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FLAG} ")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAG} ")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${FLAG} ")
+	set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ${FLAG} ")
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${FLAG} ")
+	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${FLAG} ")
+	set(CXX_STD0X_FLAGS "${FLAG}" )
+ENDMACRO(AddSTDFlag FLAG)
+
+if(WIN32)
+	CHECK_CXX_ACCEPTS_FLAG("-std=gnu++0x" CXX_FLAG_GXX0X)
+	if(CXX_FLAG_GXX0X)
+		AddSTDFlag("-std=gnu++0x")
+	endif(CXX_FLAG_GXX0X)
+else(WIN32)
+	CHECK_CXX_ACCEPTS_FLAG("-std=c++11" CXX_FLAG_CXX11)
+	if(CXX_FLAG_CXX11)
+		AddSTDFlag("-std=c++11")
+	else()
+		# try to use compiler flag -std=c++0x for older compilers
+		CHECK_CXX_ACCEPTS_FLAG("-std=c++0x" CXX_FLAG_CXX0X)
+		if(CXX_FLAG_CXX0X)
+			AddSTDFlag("-std=c++0x")
+		endif(CXX_FLAG_CXX0X)
+	endif(CXX_FLAG_CXX11)
+endif(WIN32)
 
 if(NOT CXX_STD0X_FLAGS)
 	message(FATAL "you need a c++11 compatible compiler")
-endif()
+endif()