From f9a25490805de5187d98a5a0f38c211063406f2d Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Tue, 28 Feb 2017 13:52:45 +0100
Subject: [PATCH] cmake: set_compiler_flags: improve checking of variables
removed the -+ signs from variables for the result variable. This variable is passed as a macro to the compilation test and produces a warning otherwise. If using Werror this then fails
---
cmake/DD4hepBuild.cmake | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/cmake/DD4hepBuild.cmake b/cmake/DD4hepBuild.cmake
index d88a8e895..251708600 100644
--- a/cmake/DD4hepBuild.cmake
+++ b/cmake/DD4hepBuild.cmake
@@ -40,8 +40,14 @@ macro(dd4hep_set_compiler_flags)
SET(COMPILER_FLAGS -Wall -Wextra -pedantic -Wshadow -Wformat-security -Wno-long-long -Wdeprecated -fdiagnostics-color=auto -Winconsistent-missing-override)
FOREACH( FLAG ${COMPILER_FLAGS} )
- CHECK_CXX_COMPILER_FLAG( "${FLAG}" CXX_FLAG_WORKS_${FLAG} )
- IF( ${CXX_FLAG_WORKS_${FLAG}} )
+ ## meed to replace the minus or plus signs from the variables, because it is passed
+ ## as a macro to g++ which causes a warning about no whitespace after macro
+ ## definition
+ STRING(REPLACE "-" "_" FLAG_WORD ${FLAG} )
+ STRING(REPLACE "+" "P" FLAG_WORD ${FLAG_WORD} )
+
+ CHECK_CXX_COMPILER_FLAG( "${FLAG}" CXX_FLAG_WORKS_${FLAG_WORD} )
+ IF( ${CXX_FLAG_WORKS_${FLAG_WORD}} )
MESSAGE ( STATUS "Adding ${FLAG} to CXX_FLAGS" )
SET ( CMAKE_CXX_FLAGS "${FLAG} ${CMAKE_CXX_FLAGS} ")
ELSE()
@@ -49,15 +55,15 @@ macro(dd4hep_set_compiler_flags)
ENDIF()
ENDFOREACH()
- CHECK_CXX_COMPILER_FLAG("-std=c++14" CXX_FLAG_WORKS_C++14)
- CHECK_CXX_COMPILER_FLAG("-std=c++11" CXX_FLAG_WORKS_C++11)
- CHECK_CXX_COMPILER_FLAG("-ftls-model=global-dynamic" CXX_FLAG_WORKS_FTLS_global-dynamic)
+ CHECK_CXX_COMPILER_FLAG("-std=c++14" CXX_FLAG_WORKS_CXX14)
+ CHECK_CXX_COMPILER_FLAG("-std=c++11" CXX_FLAG_WORKS_CXX11)
+ CHECK_CXX_COMPILER_FLAG("-ftls-model=global-dynamic" CXX_FLAG_WORKS_FTLS_global_dynamic)
- if (NOT CXX_FLAG_WORKS_C++11)
+ if (NOT CXX_FLAG_WORKS_CXX11)
message( FATAL_ERROR "The provided compiler does not support the C++11 standard" )
endif()
- if (NOT CXX_FLAG_WORKS_FTLS_global-dynamic)
+ if (NOT CXX_FLAG_WORKS_FTLS_global_dynamic)
message( FATAL_ERROR "The provided compiler does not support the flag -ftls-model=global-dynamic" )
endif()
--
GitLab