Import Geant4 11.0.0.beta source tree
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# ------ MacOS-X ------
|
||||
# MacOS 10.8/9/10/11, clang-3.6 and higher
|
||||
# macOS 11, Apple clang-12 and higher
|
||||
#
|
||||
# Original author: Gabriele Cosmo - CERN
|
||||
#
|
||||
@@ -11,18 +11,9 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
|
||||
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
|
||||
CPPFLAGS += -DGL_SILENCE_DEPRECATION
|
||||
ifdef G4USE_STD14
|
||||
CPPFLAGS += -std=c++14
|
||||
CXXFLAGS += -std=c++14
|
||||
else
|
||||
ifdef G4USE_STD17
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
CXXFLAGS += -std=c++11
|
||||
CPPFLAGS += -std=c++11
|
||||
endif
|
||||
endif
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
G4USE_STD17 := 1
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec
|
||||
endif
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# ------ MacOS-X ------
|
||||
# MacOS 10.8/9/10/11, gcc-4.8 and higher
|
||||
# macOS 11, gcc-9.3 and higher
|
||||
#
|
||||
# Original author: Helmut Burkhardt - CERN
|
||||
# Revisions: Guy Barrand - LAL
|
||||
@@ -14,19 +14,10 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
|
||||
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
|
||||
CPPFLAGS += -DGL_SILENCE_DEPRECATION
|
||||
ifdef G4USE_STD14
|
||||
CPPFLAGS += -std=c++14
|
||||
CXXFLAGS += -std=c++14
|
||||
else
|
||||
ifdef G4USE_STD17
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
CXXFLAGS += -std=c++11
|
||||
CPPFLAGS += -std=c++11
|
||||
endif
|
||||
endif
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
# CXXFLAGS += -stdlib=libstdc++
|
||||
G4USE_STD17 := 1
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O3
|
||||
FCFLAGS := -O3
|
||||
|
||||
@@ -9,18 +9,9 @@ ifeq ($(G4SYSTEM),Linux-clang)
|
||||
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual
|
||||
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe -pthread
|
||||
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
|
||||
ifdef G4USE_STD14
|
||||
CPPFLAGS += -std=c++14
|
||||
CXXFLAGS += -std=c++14
|
||||
else
|
||||
ifdef G4USE_STD17
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
CXXFLAGS += -std=c++11
|
||||
CPPFLAGS += -std=c++11
|
||||
endif
|
||||
endif
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
G4USE_STD17 := 1
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec
|
||||
endif
|
||||
|
||||
@@ -7,18 +7,9 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual
|
||||
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe -pthread
|
||||
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
|
||||
ifdef G4USE_STD14
|
||||
CPPFLAGS += -std=c++14
|
||||
CXXFLAGS += -std=c++14
|
||||
else
|
||||
ifdef G4USE_STD17
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
CXXFLAGS += -std=c++11
|
||||
CPPFLAGS += -std=c++11
|
||||
endif
|
||||
endif
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
G4USE_STD17 := 1
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec
|
||||
endif
|
||||
|
||||
@@ -4,18 +4,9 @@
|
||||
ifeq ($(G4SYSTEM),Linux-icc)
|
||||
CXX := icc
|
||||
CXXFLAGS := -ansi -fp-model precise -w1 -pthread
|
||||
ifdef G4USE_STD14
|
||||
CPPFLAGS += -std=c++14
|
||||
CXXFLAGS += -std=c++14
|
||||
else
|
||||
ifdef G4USE_STD17
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
CXXFLAGS += -std=c++11
|
||||
CPPFLAGS += -std=c++11
|
||||
endif
|
||||
endif
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
G4USE_STD17 := 1
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec
|
||||
endif
|
||||
|
||||
@@ -36,7 +36,7 @@ ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
OGLLIBS := opengl32.lib gdi32.lib user32.lib
|
||||
endif
|
||||
ifndef UI32LIBS
|
||||
UI32LIBS := gdi32.lib user32.lib
|
||||
UI32LIBS := gdi32.lib user32.lib comctl32.lib
|
||||
endif
|
||||
ifndef QTHOME
|
||||
QTHOME := /Qt
|
||||
|
||||
Reference in New Issue
Block a user