Fixed #151: don't ignore CMAKE_CXX_FLAGS command line argument.

kisli · Dec 6, 2016 · b1b3f30 · b1b3f30
1 parent 5424aa2
commit b1b3f30
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1032,10 +1032,7 @@ IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 
 	SET(
 		CMAKE_CXX_FLAGS
-		"-D_REENTRANT=1 -W -Wall -pedantic -Warray-bounds-pointer-arithmetic -Wold-style-cast -Wconversion -Wcast-align -Wno-sign-conversion"
-		CACHE STRING
-		"C++ Compiler Flags"
-		FORCE
+		"${CMAKE_CXX_FLAGS} -D_REENTRANT=1 -W -Wall -pedantic -Warray-bounds-pointer-arithmetic -Wold-style-cast -Wconversion -Wcast-align -Wno-sign-conversion"
 	)
 
 	SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
@@ -1050,10 +1047,7 @@ ELSE()
 
 		SET(
 			CMAKE_CXX_FLAGS
-			"-D_REENTRANT=1 -W -Wall -pedantic -Wpointer-arith -Wold-style-cast -Wconversion -Wcast-align -Wno-long-long"
-			CACHE STRING
-			"C++ Compiler Flags"
-			FORCE
+			"${CMAKE_CXX_FLAGS} -D_REENTRANT=1 -W -Wall -pedantic -Wpointer-arith -Wold-style-cast -Wconversion -Wcast-align -Wno-long-long"
 		)
 
 		SET(CMAKE_CXX_FLAGS_RELEASE "-O2")