Skip to content
Snippets Groups Projects
Commit 341a3060 authored by t.knopff's avatar t.knopff
Browse files

Merge branch '3rdparty_warn_fix' into 'develop'

Add compiler flag in 3rdparty cmake file to suppress warning on newer clang compilers

See merge request !40
parents fb6576af 15c444eb
No related branches found
No related tags found
1 merge request!40Add compiler flag in 3rdparty cmake file to suppress warning on newer clang compilers
Pipeline #35349 passed
...@@ -16,11 +16,17 @@ file(GLOB source_files ...@@ -16,11 +16,17 @@ file(GLOB source_files
) )
add_definitions(-DWARNINGMSG) add_definitions(-DWARNINGMSG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMATH_NO_PLUGIN_MANAGER -DHAS_MINUIT2 -DR__HAS_MATHMORE") string(APPEND CMAKE_CXX_FLAGS " -DMATH_NO_PLUGIN_MANAGER -DHAS_MINUIT2 -DR__HAS_MATHMORE")
if(NOT WIN32) if(NOT WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations") string(APPEND CMAKE_CXX_FLAGS " -Wno-deprecated-declarations")
# suppresses a warning in
# Fit/3rdparty/RootMinimizers/mathcore/Math/GSLRngROOTWrapper.h
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
string(APPEND CMAKE_CXX_FLAGS " -Wno-dangling-gsl")
endif()
else() else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4267") string(APPEND CMAKE_CXX_FLAGS " /wd4244 /wd4267")
endif() endif()
add_library(${library_name} STATIC ${source_files}) add_library(${library_name} STATIC ${source_files})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment