From 3fce4a5c0a7e84f485a4b090dd94b07bec4987c5 Mon Sep 17 00:00:00 2001 From: Larry Shaffer Date: Tue, 24 Sep 2013 10:39:54 -0600 Subject: [PATCH] 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 --- CMakeLists.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc959e58c50..65ed93ff04f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -327,6 +327,18 @@ IF (PEDANTIC) IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-return-type-c-linkage -Wno-overloaded-virtual") ENDIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + + # add any extra CXXFLAGS flags set by user. can be -D CXX_EXTRA_FLAGS or environment variable + # command line -D option overrides environment variable + # e.g. useful for suppressing transient upstream warnings in dependencies, like Qt + SET(CXX_EXTRA_FLAGS "" CACHE STRING "Additional appended CXXFLAGS") + IF ("${CXX_EXTRA_FLAGS}" STREQUAL "" AND DEFINED $ENV{CXX_EXTRA_FLAGS}) + SET(CXX_EXTRA_FLAGS "$ENV{CXX_EXTRA_FLAGS}") + ENDIF ("${CXX_EXTRA_FLAGS}" STREQUAL "" AND DEFINED $ENV{CXX_EXTRA_FLAGS}) + IF (NOT "${CXX_EXTRA_FLAGS}" STREQUAL "") + MESSAGE (STATUS "Appending CXX_EXTRA_FLAGS") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_EXTRA_FLAGS}") + ENDIF (NOT "${CXX_EXTRA_FLAGS}" STREQUAL "") ENDIF (MSVC) ENDIF (PEDANTIC)