From a57384c5b77b95d83aab81726caf90352ebe57db Mon Sep 17 00:00:00 2001 From: Stuart Douglas Date: Thu, 14 Apr 2016 18:05:25 -0400 Subject: [PATCH] updated makefile for server --- geant4.10.02/source/externals/cuda/tests/makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/geant4.10.02/source/externals/cuda/tests/makefile b/geant4.10.02/source/externals/cuda/tests/makefile index a4aa4957..db4e91b8 100644 --- a/geant4.10.02/source/externals/cuda/tests/makefile +++ b/geant4.10.02/source/externals/cuda/tests/makefile @@ -1,15 +1,21 @@ -LIBRARY_PATH_GEANT='../../../../../geant4.10.02-install/lib/' +GEANT4_INSTALL_DIR='../../../../../geant4.10.02-install' HEADER_PATH_CUDA='../include' HEADER_PATH_CPU='../../../processes/hadronic/models/particle_hp/include' -HEADER_PATH_GEANT='../../../../../geant4.10.02-install/include/Geant4' +HEADER_PATH_GEANT=${GEANT4_INSTALL_DIR}/include/Geant4 + +# Linux +LIBRARY_PATH_GEANT=${GEANT4_INSTALL_DIR}/lib64 + +# OS X +LIBRARY_PATH_GEANT=${GEANT4_INSTALL_DIR}/lib LINK_GEANT_LIBS_CPU=-lG4processes -lG4clhep -lG4global -lG4cuda all: GenerateTestResults AnalyzeTestResults GenerateTestResults: - g++ -std=c++11 -I $(HEADER_PATH_CPU) -I $(HEADER_PATH_GEANT) -L $(LIBRARY_PATH_GEANT) $(LINK_GEANT_LIBS_CPU) GenerateTestResults.cc -o GenerateTestResults + g++ -std=c++11 -I ${HEADER_PATH_CPU} -I ${HEADER_PATH_GEANT} -L ${LIBRARY_PATH_GEANT} ${LINK_GEANT_LIBS_CPU} GenerateTestResults.cc -o GenerateTestResults AnalyzeTestResults: g++ -std=c++11 AnalyzeTestResults.cc -o AnalyzeTestResults