0748a32b2d
* Updated Geant4 and dependencies clhep and vecgeom to use cxxstd= variant so that it is applied consistently. * Make standalone geant4 data packages that are used when data is not installed with geant4. This allows installing the data files are externals that can be common to many compiler version. * move geant4 data package dependencies to umbrella package geant4-data
23 lines
1001 B
Diff
23 lines
1001 B
Diff
diff -Naur geant4.10.03.p03/cmake/Modules/Geant4LibraryBuildOptions.cmake geant4.10.03.p03/cmake/Modules/Geant4LibraryBuildOptions.cmake
|
|
--- geant4.10.03.p03/cmake/Modules/Geant4LibraryBuildOptions.cmake 2017-10-20 06:30:46.000000000 -0500
|
|
+++ geant4.10.03.p03/cmake/Modules/Geant4LibraryBuildOptions.cmake 2018-04-16 16:48:02.194321171 -0500
|
|
@@ -76,7 +76,7 @@
|
|
# Mark as advanced because most users will not need it
|
|
enum_option(GEANT4_BUILD_CXXSTD
|
|
DOC "C++ Standard to compile against"
|
|
- VALUES 11 14 c++11 c++14
|
|
+ VALUES 11 14 17 c++11 c++14 c++17
|
|
CASE_INSENSITIVE
|
|
)
|
|
|
|
@@ -106,6 +106,9 @@
|
|
|
|
# Add Definition to flags for temporary back compatibility
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DG4USE_STD11")
|
|
+if(GEANT4_BUILD_CXXSTD GREATER 14)
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES=1")
|
|
+endif()
|
|
|
|
# Hold any appropriate compile flag(s) in variable for later export to
|
|
# config files. Needed to support late CMake 2.8 where compile features
|