Import Geant4 10.6.1 source tree
This commit is contained in:
Gabriele Cosmo
@@ -30,6 +30,27 @@ add this in the documentation for the changed file as [BUGFIX #BUGNUMBER].
|
||||
|
||||
----------------------------------------------------------
|
||||
|
||||
14th February 2020 - Ben Morgan (cmake-V10-05-34)
|
||||
- No longer create gnumake symlinks on Windows
|
||||
Windows permissions may prevent creation of symlinks, leading to
|
||||
errors at install time. As gnumake is no longer supported on
|
||||
Windows, protect symlink creation with test on host platform.
|
||||
|
||||
5th February 2020 - Ben Morgan (cmake-V10-05-33)
|
||||
- Apply patch from TXCorp to allow compilation on Windows using Clang
|
||||
|
||||
4th February 2020 - Ben Morgan (cmake-V10-05-32)
|
||||
- BUGFIX 2221
|
||||
Use "${FOO:-}" variable expansion and "-z" test to check for
|
||||
undefined variables in Bourne Shell scripts. Prevents errors when
|
||||
shell is in "set -u" mode. Report and patch supplied by Michael Reilly
|
||||
|
||||
28th January 2020 - Gunter Folger (cmake-V10-05-31)
|
||||
- Switch to patched dataset for G4EMLOW 7.9.1
|
||||
|
||||
15th January 2020 - Ben Morgan (cmake-V10-05-30)
|
||||
- Quote VECGEOM_COMPILE_DEFINITIONS to avoid incorrect argument errors
|
||||
|
||||
25th November 2019 - Ben Morgan (cmake-V10-05-29)
|
||||
- Disable configuration of Wt UI/Vis driver due to it no longer
|
||||
compiling with recent Wt versions
|
||||
|
||||
@@ -284,7 +284,7 @@ function(_g4tc_setenv_ifnotset_command TEMPLATE_NAME SHELL_FAMILY VARIABLE_NAME
|
||||
# Have to make this section verbatim to get correct formatting
|
||||
set(${TEMPLATE_NAME}
|
||||
"
|
||||
if test \"x\$${VARIABLE_NAME}\" = \"x\" ; then
|
||||
if [ -z \"\$\{${VARIABLE_NAME}-\}\" ] ; then
|
||||
export ${VARIABLE_NAME}=${VARIABLE_VALUE}
|
||||
fi
|
||||
"
|
||||
@@ -317,7 +317,7 @@ function(_g4tc_prepend_path TEMPLATE_NAME SHELL_FAMILY PATH_VARIABLE
|
||||
# We have to make this section verbatim
|
||||
set(${TEMPLATE_NAME}
|
||||
"
|
||||
if test \"x\$${PATH_VARIABLE}\" = \"x\" ; then
|
||||
if [ -z \"\$\{${PATH_VARIABLE}-\}\" ] ; then
|
||||
export ${PATH_VARIABLE}=${APPEND_VARIABLE}
|
||||
else
|
||||
export ${PATH_VARIABLE}=${APPEND_VARIABLE}:\${${PATH_VARIABLE}}
|
||||
@@ -354,7 +354,7 @@ function(_g4tc_append_path TEMPLATE_NAME SHELL_FAMILY PATH_VARIABLE
|
||||
# We have to make this section verbatim
|
||||
set(${TEMPLATE_NAME}
|
||||
"
|
||||
if test \"x\$${PATH_VARIABLE}\" = \"x\" ; then
|
||||
if [ -z \"\$\{${PATH_VARIABLE}-\}\" ] ; then
|
||||
export ${PATH_VARIABLE}=${APPEND_VARIABLE}
|
||||
else
|
||||
export ${PATH_VARIABLE}=\${${PATH_VARIABLE}}:${APPEND_VARIABLE}
|
||||
@@ -805,14 +805,11 @@ install(DIRECTORY config
|
||||
PATTERN "scripts/" EXCLUDE
|
||||
)
|
||||
|
||||
# Compatibility softlink to library directory, we do this on all
|
||||
# platforms, but it does nothing on Windows (well, at least the
|
||||
# attempted symlink creation does not)
|
||||
# Take care to quote the path names to avoid issues with spaces
|
||||
install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E make_directory \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_LIBDIR}/Geant4-${Geant4_VERSION}\")")
|
||||
|
||||
install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink .. ${GEANT4_SYSTEM}-${GEANT4_COMPILER} WORKING_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_LIBDIR}/Geant4-${Geant4_VERSION}\")")
|
||||
|
||||
# Compatibility softlink to library directory on UNIX only
|
||||
if(UNIX)
|
||||
install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E make_directory \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_LIBDIR}/Geant4-${Geant4_VERSION}\")")
|
||||
install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink .. ${GEANT4_SYSTEM}-${GEANT4_COMPILER} WORKING_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_LIBDIR}/Geant4-${Geant4_VERSION}\")")
|
||||
endif()
|
||||
|
||||
#-----------------------------------------------------------------------
|
||||
# TEMPORARY
|
||||
|
||||
@@ -11,7 +11,7 @@ if(VecGeom_FOUND)
|
||||
|
||||
string(REGEX REPLACE "^\-D|;-D" ";" VECGEOM_COMPILE_DEFINITIONS "${VECGEOM_DEFINITIONS}")
|
||||
set_target_properties(VecGeom::VecGeom PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS ${VECGEOM_COMPILE_DEFINITIONS}
|
||||
INTERFACE_COMPILE_DEFINITIONS "${VECGEOM_COMPILE_DEFINITIONS}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${VECGEOM_INCLUDE_DIRS}"
|
||||
INTERFACE_LINK_LIBRARIES "${VECGEOM_LIBRARIES}"
|
||||
IMPORTED_LOCATION "${VECGEOM_LIBRARY}")
|
||||
|
||||
@@ -18,11 +18,11 @@ geant4_add_dataset(
|
||||
# - Low energy electromagnetics
|
||||
geant4_add_dataset(
|
||||
NAME G4EMLOW
|
||||
VERSION 7.9
|
||||
VERSION 7.9.1
|
||||
FILENAME G4EMLOW
|
||||
EXTENSION tar.gz
|
||||
ENVVAR G4LEDATA
|
||||
MD5SUM d28a09f0c93243522512cf2a3a733348
|
||||
MD5SUM 1308dc5d73b5539557e2ec6b96f7e5ef
|
||||
)
|
||||
|
||||
# - Photon evaporation
|
||||
|
||||
@@ -11,25 +11,31 @@
|
||||
# 2) Set the compile flags/features when using CMake < 3.10
|
||||
#
|
||||
if(MSVC)
|
||||
# This seems to indicate CMAKE_C_SIMULATE_ID
|
||||
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
|
||||
# Require MSVC that supports standard flags and std::filesystem
|
||||
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.20)
|
||||
message(FATAL_ERROR "Geant4 requires MSVC 19.20 (Visual Studio 2019 Version 16.0) or newer")
|
||||
else()
|
||||
# Set cxxstd flags on CMake < 3.10
|
||||
if(CMAKE_VERSION VERSION_LESS 3.10)
|
||||
# VS 2015 Update 3 and above support language standard level flags,
|
||||
# with the default and minimum level being C++14.
|
||||
set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "")
|
||||
set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "")
|
||||
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "")
|
||||
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "")
|
||||
set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std:c++14")
|
||||
set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std:c++14")
|
||||
set(CMAKE_CXX17_STANDARD_COMPILE_OPTION "-std:c++17")
|
||||
set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std:c++17")
|
||||
list(APPEND CMAKE_CXX17_COMPILE_FEATURES cxx_std_17)
|
||||
set(CMAKE_CXX_COMPILE_FEATURES ${CMAKE_CXX_COMPILE_FEATURES} "${CMAKE_CXX17_COMPILE_FEATURES}")
|
||||
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.20)
|
||||
message(FATAL_ERROR "Geant4 requires MSVC 19.20 (Visual Studio 2019 Version 16.0) or newer")
|
||||
else()
|
||||
# Set cxxstd flags on CMake < 3.10
|
||||
if(CMAKE_VERSION VERSION_LESS 3.10)
|
||||
# VS 2015 Update 3 and above support language standard level flags,
|
||||
# with the default and minimum level being C++14.
|
||||
set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "")
|
||||
set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "")
|
||||
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "")
|
||||
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "")
|
||||
set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std:c++14")
|
||||
set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std:c++14")
|
||||
set(CMAKE_CXX17_STANDARD_COMPILE_OPTION "-std:c++17")
|
||||
set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std:c++17")
|
||||
list(APPEND CMAKE_CXX17_COMPILE_FEATURES cxx_std_17)
|
||||
set(CMAKE_CXX_COMPILE_FEATURES ${CMAKE_CXX_COMPILE_FEATURES} "${CMAKE_CXX17_COMPILE_FEATURES}")
|
||||
endif()
|
||||
endif()
|
||||
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||
else()
|
||||
message(FATAL_ERROR "Geant4 requires Visual Studio or Clang.")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user