Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Geant4
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LHCb
Geant4
Commits
07da1cef
Commit
07da1cef
authored
8 months ago
by
Marco Clemencic
Browse files
Options
Downloads
Patches
Plain Diff
Use C++20 when building with gcc>=13 or clang>=16
parent
b10c7474
No related branches found
No related tags found
1 merge request
!114
Use C++20 when building with gcc>=13 or clang>=16
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmake/Modules/LHCbSettings.cmake
+8
-2
8 additions, 2 deletions
cmake/Modules/LHCbSettings.cmake
with
8 additions
and
2 deletions
cmake/Modules/LHCbSettings.cmake
+
8
−
2
View file @
07da1cef
###############################################################################
# (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration
#
# (c) Copyright 2021
-2024
CERN for the benefit of the LHCb Collaboration #
# #
# This software is distributed under the terms of the GNU General Public #
# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
...
...
@@ -19,7 +19,13 @@ find_data_package(Geant4Files ${Geant4_VERSION_MAJOR}${Geant4_VERSION_MINOR}.0)
# FIXME: this should match the version used by ROOT (LCG version + compiler version)
set
(
GEANT4_BUILD_CXXSTD 17 CACHE STRING
"C++ Standard"
)
if
(
(
CMAKE_CXX_COMPILER_ID STREQUAL
"GNU"
AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS
"13.0"
)
OR
(
CMAKE_CXX_COMPILER_ID STREQUAL
"Clang"
AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS
"16.0"
)
)
set
(
LHCB_DEFAULT_CXXSTD 17
)
else
()
set
(
LHCB_DEFAULT_CXXSTD 20
)
endif
()
set
(
GEANT4_BUILD_CXXSTD
${
LHCB_DEFAULT_CXXSTD
}
CACHE STRING
"C++ Standard"
)
set
(
OpenGL_GL_PREFERENCE
"GLVND"
CACHE STRING
"Preferred GL library to use (see https://cmake.org/cmake/help/v3.12/policy/CMP0072.html)"
)
...
...
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