Skip to content

Commit b40e395

Browse files
committed
fixes for problems on linux
1 parent e72dc58 commit b40e395

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

genfit/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
7979

8080
include(CheckCXXCompilerFlag)
8181
# ROOT 6 requires c++11 support, enforced via headers
82-
If (ROOT_FOUND_VERSION LESS 59999)
82+
If (ROOT_FOUND_VERSION LESS 59999 OR NOT ROOT_FOUND_VERSION)
8383
check_cxx_compiler_flag(-std=c++03 HAS_STD_FLAG)
8484
check_cxx_compiler_flag(--std=c++03 HAS_STD_FLAG_ALTERNATIVE)
8585
if (HAS_STD_FLAG)
@@ -90,6 +90,7 @@ If (ROOT_FOUND_VERSION LESS 59999)
9090
message("Neither --std=c++03 nor -std=c++03 seem to work. Moving on.")
9191
endif()
9292
else()
93+
message("setup for ROOT6 ${ROOT_FOUND_VERSION}")
9394
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
9495
EndIf()
9596

shipgen/GenLinkDef.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#pragma link C++ class MuDISGenerator+;
1414
#pragma link C++ class NuageGenerator+;
1515

16+
/*
1617
#pragma link C++ class Pythia8::Pythia+;
1718
#pragma link C++ class Pythia8::Event+;
1819
#pragma link C++ class Pythia8::Info+;
@@ -34,7 +35,6 @@
3435
#pragma link C++ class Pythia8::LHArwgt+;
3536
#pragma link C++ class Pythia8::SusyLesHouches+;
3637
//#pragma link C++ class Pythia8::CoupSUSY+; // does not compile
37-
/*
3838
#pragma link C++ class Pythia8::Junction+;
3939
#pragma link C++ class Pythia8::Vec4+;
4040
#pragma link C++ class Pythia8::InBeam+;

0 commit comments

Comments
 (0)