|
|
@@ -148,7 +148,7 @@ SET (CMAKE_BUILD_TYPE "" CACHE STRING
|
|
|
# on the initial values computed in the platform/*.cmake files
|
|
|
# use _INIT variables so that this only happens the first time
|
|
|
# and you can set these flags in the cmake cache
|
|
|
-SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_INIT}" CACHE STRING
|
|
|
+SET (CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} ${CMAKE_CXX_FLAGS_INIT}" CACHE STRING
|
|
|
"Flags used by the compiler during all build types.")
|
|
|
SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG_INIT}" CACHE STRING
|
|
|
"Flags used by the compiler during debug builds.")
|
|
|
@@ -160,7 +160,7 @@ SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT}" CAC
|
|
|
"Flags used by the compiler during Release with Debug Info builds.")
|
|
|
SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_INIT}" CACHE STRING
|
|
|
"Flags for C compiler.")
|
|
|
-SET (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG_INIT}" CACHE STRING
|
|
|
+SET (CMAKE_C_FLAGS_DEBUG "$ENV{CFLAGS} ${CMAKE_C_FLAGS_DEBUG_INIT}" CACHE STRING
|
|
|
"Flags used by the compiler during debug builds.")
|
|
|
SET (CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL_INIT}" CACHE STRING
|
|
|
"Flags used by the compiler during release minsize builds.")
|
Bill Hoffman