Skip to content

Commit 3fce4a5

Browse files
committed
Add extra CXXFLAGS flags set by user; can be -D CXX_EXTRA_FLAGS or environment variable
- Command line -D option overrides environment variable - Useful for suppressing transient upstream warnings in dependencies, like Qt
1 parent 1ca2258 commit 3fce4a5

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

CMakeLists.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,18 @@ IF (PEDANTIC)
327327
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
328328
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage -Wno-overloaded-virtual")
329329
ENDIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
330+
331+
# add any extra CXXFLAGS flags set by user. can be -D CXX_EXTRA_FLAGS or environment variable
332+
# command line -D option overrides environment variable
333+
# e.g. useful for suppressing transient upstream warnings in dependencies, like Qt
334+
SET(CXX_EXTRA_FLAGS "" CACHE STRING "Additional appended CXXFLAGS")
335+
IF ("${CXX_EXTRA_FLAGS}" STREQUAL "" AND DEFINED $ENV{CXX_EXTRA_FLAGS})
336+
SET(CXX_EXTRA_FLAGS "$ENV{CXX_EXTRA_FLAGS}")
337+
ENDIF ("${CXX_EXTRA_FLAGS}" STREQUAL "" AND DEFINED $ENV{CXX_EXTRA_FLAGS})
338+
IF (NOT "${CXX_EXTRA_FLAGS}" STREQUAL "")
339+
MESSAGE (STATUS "Appending CXX_EXTRA_FLAGS")
340+
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_EXTRA_FLAGS}")
341+
ENDIF (NOT "${CXX_EXTRA_FLAGS}" STREQUAL "")
330342
ENDIF (MSVC)
331343

332344
ENDIF (PEDANTIC)

0 commit comments

Comments
 (0)