Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
15c444eb
Commit
15c444eb
authored
3 years ago
by
t.knopff
Browse files
Options
Downloads
Patches
Plain Diff
Small changes after discussion
parent
6ab2859b
No related branches found
No related tags found
1 merge request
!40
Add compiler flag in 3rdparty cmake file to suppress warning on newer clang compilers
Pipeline
#35345
passed
3 years ago
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Fit/3rdparty/RootMinimizers/CMakeLists.txt
+5
-6
5 additions, 6 deletions
Fit/3rdparty/RootMinimizers/CMakeLists.txt
with
5 additions
and
6 deletions
Fit/3rdparty/RootMinimizers/CMakeLists.txt
+
5
−
6
View file @
15c444eb
...
@@ -16,18 +16,17 @@ file(GLOB source_files
...
@@ -16,18 +16,17 @@ file(GLOB source_files
)
)
add_definitions
(
-DWARNINGMSG
)
add_definitions
(
-DWARNINGMSG
)
s
et
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-DMATH_NO_PLUGIN_MANAGER -DHAS_MINUIT2 -DR__HAS_MATHMORE"
)
s
tring
(
APPEND
CMAKE_CXX_FLAGS
"
-DMATH_NO_PLUGIN_MANAGER -DHAS_MINUIT2 -DR__HAS_MATHMORE"
)
if
(
NOT WIN32
)
if
(
NOT WIN32
)
s
et
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-deprecated-declarations"
)
s
tring
(
APPEND
CMAKE_CXX_FLAGS
"
-Wno-deprecated-declarations"
)
#
The following code
suppresses a warning in
# suppresses a warning in
# Fit/3rdparty/RootMinimizers/mathcore/Math/GSLRngROOTWrapper.h
# Fit/3rdparty/RootMinimizers/mathcore/Math/GSLRngROOTWrapper.h
# which is issued in newer versions of clang.
if
(
CMAKE_CXX_COMPILER_ID STREQUAL
"Clang"
if
(
CMAKE_CXX_COMPILER_ID STREQUAL
"Clang"
AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10
)
AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 10
)
s
et
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-dangling-gsl"
)
s
tring
(
APPEND
CMAKE_CXX_FLAGS
"
-Wno-dangling-gsl"
)
endif
()
endif
()
else
()
else
()
s
et
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/wd4244 /wd4267"
)
s
tring
(
APPEND
CMAKE_CXX_FLAGS
"
/wd4244 /wd4267"
)
endif
()
endif
()
add_library
(
${
library_name
}
STATIC
${
source_files
}
)
add_library
(
${
library_name
}
STATIC
${
source_files
}
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment