Skip to content
Snippets Groups Projects
Commit a4a41402 authored by adrien-matta's avatar adrien-matta
Browse files

* Trying to fix travis compilation

parent 7d4fb1cb
No related branches found
No related tags found
No related merge requests found
...@@ -72,13 +72,6 @@ endif() ...@@ -72,13 +72,6 @@ endif()
#include_directories( ${ROOT_INCLUDE_DIR}) #include_directories( ${ROOT_INCLUDE_DIR})
#link_directories( ${ROOT_LIBRARY_DIR}) #link_directories( ${ROOT_LIBRARY_DIR})
# Get the compilator flag from root to assure consistancy
EXEC_PROGRAM(${NPTOOL_ROOT_CONFIG}
ARGS "--cflags"
OUTPUT_VARIABLE root_cflags )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${root_cflags}")
if(Geant4_gdml_FOUND) if(Geant4_gdml_FOUND)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNPS_GDML") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNPS_GDML")
endif() endif()
......
...@@ -86,6 +86,7 @@ void EventAction::ProgressDisplay(){ ...@@ -86,6 +86,7 @@ void EventAction::ProgressDisplay(){
char* timer; char* timer;
double check ; double check ;
check = 0;
if(remain>60) if(remain>60)
check = asprintf(&timer,"%dmin",(int)(remain/60.)); check = asprintf(&timer,"%dmin",(int)(remain/60.));
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment