Import Geant4 10.5.0 source tree
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
# $Id: G4UI_BUILD.gmk 66368 2012-12-18 09:20:17Z gcosmo $
|
||||
# -------------------------------------------------------------
|
||||
# Interfaces-specific CPPFLAGS for BUILD phase.
|
||||
# John Allison, 6th July 1998.
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# $Id: G4UI_USE.gmk 66368 2012-12-18 09:20:17Z gcosmo $
|
||||
# -------------------------------------------------------------
|
||||
# GNUmakefile for CPPFLAGS for interfaces USE phase.
|
||||
# John Allison, 6th July 1998.
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# $Id: G4VIS_BUILD.gmk 66368 2012-12-18 09:20:17Z gcosmo $
|
||||
# -------------------------------------------------------------
|
||||
# Visualization-specific CPPFLAGS for BUILD phase.
|
||||
# John Allison, 24th January 1998.
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# $Id: G4VIS_USE.gmk 66368 2012-12-18 09:20:17Z gcosmo $
|
||||
# -------------------------------------------------------------
|
||||
# GNUmakefile for CPPFLAGS for visualization USE phase.
|
||||
# John Allison, 24th January 1998.
|
||||
|
||||
+15
-1
@@ -1,4 +1,3 @@
|
||||
svn log $Id: History 109363 2018-04-12 15:17:01Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -16,6 +15,21 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
28th September 2018 Gabriele Cosmo (config-V10-04-09)
|
||||
- Added -DGL_SILENCE_DEPRECATION to CPPFLAGS to Darwin setups to silence
|
||||
deprecation compilation warnings on MacOS 10.14 Mojave.
|
||||
|
||||
18th September 2018 Gabriele Cosmo (config-V10-04-08)
|
||||
- Cleanup settings for GL in Darwin-clang.gmk and Darwin-g++.gmk.
|
||||
|
||||
12th September 2018 Gabriele Cosmo (config-V10-04-07)
|
||||
- Withdraw changes of last tag for Linux-g++ and corrected use of
|
||||
G4RUNPATHOPTION in binmake.gmk for installed kernel libraries.
|
||||
|
||||
7th September 2018 Gabriele Cosmo (config-V10-04-06)
|
||||
- Fixed setting of G4RUNPATHOPTION in Darwin/Linux-clang/g++ and binmake.cmk.
|
||||
Addressing problem report #2086.
|
||||
|
||||
12th April 2018 Gabriele Cosmo (config-V10-04-05)
|
||||
- WIN32-VC.gmk: updated obsolete configuration for Qt5.
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# $Id: analysis.gmk 66368 2012-12-18 09:20:17Z gcosmo $
|
||||
# Guy Barrand, 20th Mai 2000
|
||||
#
|
||||
# Analysis variables...
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# $Id: architecture.gmk 108986 2018-03-20 14:45:18Z gcosmo $
|
||||
# ------------------------------------------------------------------------
|
||||
# GEANT 4 - Architecture configuration script for GNU Make
|
||||
#
|
||||
|
||||
+1
-1
@@ -1,4 +1,3 @@
|
||||
# $Id: binmake.gmk 106467 2017-10-11 08:09:08Z gcosmo $
|
||||
# ----------------------------------------------------------
|
||||
# Script defining rules and paths for making binaries.
|
||||
# First implementation: Gabriele Cosmo, 25/06/1998.
|
||||
@@ -194,6 +193,7 @@ ifdef G4EXLIB
|
||||
# For the example dependent directory, keep the
|
||||
# path to the shared lib in the executable.
|
||||
LDFLAGS += $(G4RUNPATHOPTION)$(G4TMPDIR)
|
||||
LDFLAGS += $(G4RUNPATHOPTION)$(G4LIB)/$(G4SYSTEM)
|
||||
endif
|
||||
endif
|
||||
include $(G4INSTALL)/config/common.gmk
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# $Id: common.gmk 66368 2012-12-18 09:20:17Z gcosmo $
|
||||
# ----------------------------------------------------------------
|
||||
# Common part of GNUmakefile for libraries. John Allison, 5/7/95.
|
||||
# ----------------------------------------------------------------
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
//$Id: genconf.cpp,v 1.35 2008/10/15 21:51:24 marcocle Exp $ //
|
||||
|
||||
#ifdef _WIN32
|
||||
// Disable a warning in Boost program_options headers:
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# $Id:$
|
||||
# ----------------------------------------------------------------------------
|
||||
# Gabriele Cosmo, 11th October 2013
|
||||
#
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# $Id: globlib.gmk 66368 2012-12-18 09:20:17Z gcosmo $
|
||||
# --------------------------------------------------------------
|
||||
# Script for compound libraries. Gabriele Cosmo, 25/6/98.
|
||||
# --------------------------------------------------------------
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# $Id: interactivity.gmk 66368 2012-12-18 09:20:17Z gcosmo $
|
||||
# GNUmakefile for CPPFLAGS, LDFLAGS for interactivy,
|
||||
# ie interfaces and visualization.
|
||||
#
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
/* $Id: liblist.c 66368 2012-12-18 09:20:17Z gcosmo $ */
|
||||
|
||||
/*
|
||||
Given a "libname.map" file on standard input and a list or directory
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# $Id: moc.gmk 66368 2012-12-18 09:20:17Z gcosmo $
|
||||
# ----------------------------------------------------------------
|
||||
# Common part of GNUmakefile for libraries. John Allison, 5/7/95.
|
||||
# ----------------------------------------------------------------
|
||||
|
||||
@@ -10,6 +10,7 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual
|
||||
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
|
||||
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
|
||||
CPPFLAGS += -DGL_SILENCE_DEPRECATION
|
||||
G4USE_STD11 := 1
|
||||
ifdef G4USE_STD14
|
||||
CPPFLAGS += -std=c++14
|
||||
@@ -47,7 +48,7 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
FCFLAGS += -O2 -g
|
||||
CCFLAGS += -O2 -g
|
||||
endif
|
||||
G4RUNPATHOPTION := -Wl,-rpath
|
||||
G4RUNPATHOPTION := -Wl,-rpath,
|
||||
# G4STATIC_MODE += -Wl,-force_load
|
||||
FC := gfortran
|
||||
FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
|
||||
@@ -84,12 +85,12 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
OGLFLAGS := -I$(OGLHOME)/include
|
||||
endif
|
||||
ifndef OGLLIBS
|
||||
QTGLPATH := $(shell test -f /System/Library/Frameworks/OpenGL.framework/OpenGL && echo "/System/Library/Frameworks/OpenGL.framework")
|
||||
ifeq ($(QTGLPATH),/System/Library/Frameworks/OpenGL.framework)
|
||||
OGLLIBS := -F/System/Library/Frameworks -framework OpenGL -framework AGL
|
||||
ifeq ($(G4VIS_USE_OPENGLX),1)
|
||||
OGLLIBS += -L$(OGLHOME)/lib -lGLU -lGL
|
||||
endif
|
||||
OGLPATH := $(shell test -f /Library/Frameworks/OpenGL.framework/OpenGL && echo "/Library/Frameworks/OpenGL.framework")
|
||||
ifneq ($(OGLPATH),/Library/Frameworks/OpenGL.framework)
|
||||
OGLPATH := $(shell test -f /System/Library/Frameworks/OpenGL.framework/OpenGL && echo "/System/Library/Frameworks/OpenGL.framework")
|
||||
endif
|
||||
ifneq ($(OGLPATH),)
|
||||
OGLLIBS := -F$(OGLPATH)/.. -framework OpenGL -framework AGL
|
||||
else
|
||||
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
|
||||
endif
|
||||
|
||||
@@ -13,6 +13,7 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual
|
||||
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
|
||||
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
|
||||
CPPFLAGS += -DGL_SILENCE_DEPRECATION
|
||||
G4USE_STD11 := 1
|
||||
ifdef G4USE_STD14
|
||||
CPPFLAGS += -std=c++14
|
||||
@@ -53,8 +54,8 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
FCFLAGS += -fPIC
|
||||
CCFLAGS += -fPIC
|
||||
endif
|
||||
G4RUNPATHOPTION := -Wl,-rpath
|
||||
G4STATIC_MODE += -Wl,-force_load
|
||||
G4RUNPATHOPTION := -Wl,-rpath,
|
||||
# G4STATIC_MODE += -Wl,-force_load
|
||||
FC := gfortran
|
||||
FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
|
||||
LDFLAGS += -bind_at_load
|
||||
@@ -92,18 +93,29 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
# OGLFLAGS := -I$(OGLHOME)/Headers
|
||||
endif
|
||||
ifndef OGLLIBS
|
||||
QTGLPATH := $(shell test -f /System/Library/Frameworks/OpenGL.framework/OpenGL && echo "/System/Library/Frameworks/OpenGL.framework")
|
||||
ifeq ($(QTGLPATH),/System/Library/Frameworks/OpenGL.framework)
|
||||
OGLPATH := $(shell test -f /Library/Frameworks/OpenGL.framework/OpenGL && echo "/Library/Frameworks/OpenGL.framework")
|
||||
ifneq ($(OGLPATH),/Library/Frameworks/OpenGL.framework)
|
||||
OGLPATH := $(shell test -f /System/Library/Frameworks/OpenGL.framework/OpenGL && echo "/System/Library/Frameworks/OpenGL.framework")
|
||||
endif
|
||||
ifneq ($(OGLPATH),)
|
||||
OGLLIBS := -F$(OGLPATH)/.. -framework OpenGL -framework AGL
|
||||
else
|
||||
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
|
||||
endif
|
||||
endif
|
||||
ifndef OGLLIBS
|
||||
OGLPATH := $(shell test -f /Library/Frameworks/OpenGL.framework/OpenGL && echo "/Library/Frameworks/OpenGL.framework")
|
||||
ifneq ($(OGLPATH),/Library/Frameworks/OpenGL.framework)
|
||||
OGLPATH := $(shell test -f /System/Library/Frameworks/OpenGL.framework/OpenGL && echo "/System/Library/Frameworks/OpenGL.framework")
|
||||
endif
|
||||
ifneq ($(OGLPATH),)
|
||||
DARWIN_VERSION = $(shell uname -r | sed 's/\([0-9]*\).[0-9]*.[0-9]*/\1/')
|
||||
ifeq ($(DARWIN_VERSION),9)
|
||||
# the following lines are for building on MacOSX 10.5 "Leopard"
|
||||
OGLLIBS := -Wl,$(QTGLPATH)/Versions/A/Libraries/libGL.dylib -L$(OGLHOME)/lib -lGLU -lGL
|
||||
OGLLIBS := -Wl,$(OGLPATH)/Libraries/libGL.dylib -L$(OGLHOME)/lib -lGLU -lGL
|
||||
else
|
||||
# the following lines are for building on MacOSX > 10.5
|
||||
OGLLIBS := -F/System/Library/Frameworks -framework OpenGL -framework AGL
|
||||
ifeq ($(G4VIS_USE_OPENGLX),1)
|
||||
OGLLIBS += -L$(OGLHOME)/lib -lGLU -lGL
|
||||
endif
|
||||
OGLLIBS := -F$(OGLPATH)/.. -framework OpenGL -framework AGL
|
||||
endif
|
||||
else
|
||||
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
|
||||
|
||||
@@ -51,7 +51,7 @@ ifeq ($(G4SYSTEM),Linux-clang)
|
||||
FCFLAGS += -fPIC
|
||||
CCFLAGS += -fPIC
|
||||
endif
|
||||
G4RUNPATHOPTION := -Wl,-rpath
|
||||
G4RUNPATHOPTION := -Wl,-rpath,
|
||||
G4STATIC_MODE += -Wl,--whole-archive
|
||||
G4NOSTATIC_MODE += -Wl,--no-whole-archive
|
||||
CC := clang
|
||||
|
||||
Reference in New Issue
Block a user