fixes for problems on linux

ShipSoft · Oct 13, 2015 · b40e395 · b40e395
1 parent e72dc58
commit b40e395
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/genfit/CMakeLists.txt b/genfit/CMakeLists.txt
@@ -79,7 +79,7 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
 
 include(CheckCXXCompilerFlag)
 # ROOT 6 requires c++11 support, enforced via headers
-If (ROOT_FOUND_VERSION LESS 59999)
+If (ROOT_FOUND_VERSION LESS 59999 OR NOT ROOT_FOUND_VERSION)
  check_cxx_compiler_flag(-std=c++03 HAS_STD_FLAG)
  check_cxx_compiler_flag(--std=c++03 HAS_STD_FLAG_ALTERNATIVE)
  if (HAS_STD_FLAG)
@@ -90,6 +90,7 @@ If (ROOT_FOUND_VERSION LESS 59999)
   message("Neither --std=c++03 nor -std=c++03 seem to work.  Moving on.")
  endif()
 else() 
+   message("setup for ROOT6 ${ROOT_FOUND_VERSION}")
    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 EndIf()
 

diff --git a/shipgen/GenLinkDef.h b/shipgen/GenLinkDef.h
@@ -13,6 +13,7 @@
 #pragma link C++ class  MuDISGenerator+;
 #pragma link C++ class  NuageGenerator+;
 
+/*
 #pragma link C++ class Pythia8::Pythia+;
 #pragma link C++ class Pythia8::Event+;
 #pragma link C++ class Pythia8::Info+;
@@ -34,7 +35,6 @@
 #pragma link C++ class Pythia8::LHArwgt+;
 #pragma link C++ class Pythia8::SusyLesHouches+;
 //#pragma link C++ class Pythia8::CoupSUSY+; // does not compile
-/*
 #pragma link C++ class Pythia8::Junction+;
 #pragma link C++ class Pythia8::Vec4+;
 #pragma link C++ class Pythia8::InBeam+;