@@ -117,12 +117,6 @@ MACRO(tfel_enable_cxx_compiler_flag out)
117117ENDMACRO (tfel_enable_cxx_compiler_flag )
118118
119119#compiler specific options
120- set (CMAKE_C_FLAGS "" )
121- set (CMAKE_C_FLAGS_RELEASE "" )
122- set (CMAKE_C_FLAGS_DEBUG "" )
123- set (CMAKE_CXX_FLAGS "" )
124- set (CMAKE_CXX_FLAGS_RELEASE "" )
125- set (CMAKE_CXX_FLAGS_DEBUG "" )
126120set (VISIBILITY_FLAGS "" )
127121set (OPTIMISATION_FLAGS "" )
128122set (COMPILER_WARNINGS "" )
@@ -161,10 +155,13 @@ endif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
161155# `conda` adds `-I$PREFIX/include` in the `CFLAGS` and `CXXFLAGS`,
162156# thus, using those variables `CFLAGS` and `CXXFLAGS` solves the issue and is more
163157# consistent with other `conda` packages.
164- if (USE_EXTERNAL_COMPILER_FLAGS)
165- set (CMAKE_C_FLAGS "$ENV{CFLAGS} " )
166- set (CMAKE_CXX_FLAGS "${COMPILER_WARNINGS} $ENV{CXXFLAGS} " )
167- else (USE_EXTERNAL_COMPILER_FLAGS )
158+ if (NOT USE_EXTERNAL_COMPILER_FLAGS)
159+ set (CMAKE_C_FLAGS "" )
160+ set (CMAKE_C_FLAGS_RELEASE "" )
161+ set (CMAKE_C_FLAGS_DEBUG "" )
162+ set (CMAKE_CXX_FLAGS "" )
163+ set (CMAKE_CXX_FLAGS_RELEASE "" )
164+ set (CMAKE_CXX_FLAGS_DEBUG "" )
168165 set (CMAKE_C_FLAGS "${COMPILER_FLAGS} ${COMPILER_CFLAGS} " )
169166 set (CMAKE_CXX_FLAGS "${VISIBILITY_FLAGS} ${COMPILER_WARNINGS} ${COMPILER_FLAGS} ${COMPILER_CXXFLAGS} " )
170167 if (CMAKE_BUILD_TYPE STREQUAL "Profiling" )
@@ -183,5 +180,5 @@ else(USE_EXTERNAL_COMPILER_FLAGS)
183180 set (CMAKE_CXX_FLAGS "${OPTIMISATION_FLAGS_MARCH} ${CMAKE_CXX_FLAGS} " )
184181 endif (NOT enable-portable-build )
185182 endif (CMAKE_BUILD_TYPE STREQUAL "Profiling" )
186- endif (USE_EXTERNAL_COMPILER_FLAGS )
183+ endif (NOT USE_EXTERNAL_COMPILER_FLAGS )
187184
0 commit comments