Clean up ALICEO2_MODULAR_BUILD

Author: Dario Berzano

CMakeLists.txt

@@ -33,31 +33,7 @@ ADD_CUSTOM_TARGET(man ALL)
 #In case you need Fortran
 #ENABLE_LANGUAGE(Fortran)
 
-# Check for needed environment variables
-#IF not stop execution unless modular build is activated
-Option(ALICEO2_MODULAR_BUILD "Modular build without environment variables" OFF)
-IF (NOT ALICEO2_MODULAR_BUILD)
-  IF (NOT DEFINED ENV{FAIRROOTPATH})
-    MESSAGE(FATAL_ERROR "You did not define the environment variable FAIRROOTPATH which is needed to find FairRoot. Please set this variable and execute cmake again.")
-  ENDIF (NOT DEFINED ENV{FAIRROOTPATH})
-
-  IF (NOT DEFINED ENV{SIMPATH})
-    MESSAGE(FATAL_ERROR "You did not define the environment variable SIMPATH which is nedded to find the external packages. Please set this variable and execute cmake again.")
-  ENDIF (NOT DEFINED ENV{SIMPATH})
-
-  SET(SIMPATH $ENV{SIMPATH})
-  SET(FAIRROOTPATH $ENV{FAIRROOTPATH})
-
-  # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/
-  # is checked
-  set(CMAKE_MODULE_PATH "${FAIRROOTPATH}/share/fairbase/cmake/modules" ${CMAKE_MODULE_PATH})
-  set(CMAKE_MODULE_PATH "${FAIRROOTPATH}/share/fairbase/cmake/modules_old" ${CMAKE_MODULE_PATH})
-  set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
-
-  Set(CheckSrcDir "${FAIRROOTPATH}/share/fairbase/cmake/checks")
-ELSE (NOT ALICEO2_MODULAR_BUILD)
-  find_package(Boost REQUIRED)
-ENDIF (NOT ALICEO2_MODULAR_BUILD)
+find_package(Boost REQUIRED)
 
 # Load some basic macros which are needed later on
 include(O2Utils)
@@ -135,12 +111,6 @@ ENDIF (NOT UNIX)
 # directory
 CHECK_EXTERNAL_PACKAGE_INSTALL_DIR()
 
-# set a variable which should be used in all CMakeLists.txt
-# Defines all basic include directories from fairbase
-IF (NOT ALICEO2_MODULAR_BUILD)
-  SetBasicVariables()
-ENDIF (NOT ALICEO2_MODULAR_BUILD)
-
 # Set the library version in the main CMakeLists.txt
 SET(ALICEO2_MAJOR_VERSION 0)
 SET(ALICEO2_MINOR_VERSION 0)
@@ -178,25 +148,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 endif()
 unset(isSystemDir)
 
-IF (NOT ALICEO2_MODULAR_BUILD)
-  # Check IF the compiler support specific C++14 features
-  # Up to now this is only a check since the code does not use
-  # any of the features of the new standard
-  # does not work straightforward
-  include(CheckCXX11Features)
-
-  # Check IF the compilation flag -std=c++14 is set
-  IF (NOT CMAKE_CXX_FLAGS)
-    Message(FATAL_ERROR "No C++14 support found. AliceO2 requires C++14 be build.")
-  EndIF (NOT CMAKE_CXX_FLAGS)
-
-ELSE (NOT ALICEO2_MODULAR_BUILD)
-  # This needs to be improved
-  # (hopefully by making CheckCXX11Features working also with this build option)
-  set(CMAKE_CXX_FLAGS "-std=c++14 ${CMAKE_CXX_FLAGS}")
-ENDIF (NOT ALICEO2_MODULAR_BUILD)
-
-#check C++14 features
+# Check for the required C++ standard features (break if not available)
 set(CheckCXX14SrcDir "${CMAKE_SOURCE_DIR}/cmake/checks")
 include(CheckCXX14Features)
 

cmake/O2Dependencies.cmake

@@ -22,25 +22,18 @@ find_package(ROOT 6.06.00 REQUIRED)
 find_package(Vc REQUIRED)
 find_package(Pythia8)
 find_package(Pythia6)
-if (ALICEO2_MODULAR_BUILD)
-  # Installed via CMake. Note: we work around hardcoded full paths in the CMake
-  # config files not being relocated properly by appending library paths.
-  guess_append_libpath(geant321 "${Geant3_DIR}")
-  find_package(Geant3 NO_MODULE)
-  guess_append_libpath(G4run "${Geant4_DIR}")
-  find_package(Geant4 NO_MODULE)
-  guess_append_libpath(geant4vmc "${GEANT4_VMC_DIR}")
-  find_package(Geant4VMC NO_MODULE)
-  guess_append_libpath(BaseVGM "${VGM_DIR}")
-  find_package(VGM NO_MODULE)
-else (ALICEO2_MODULAR_BUILD)
-  # For old versions of VMC packages (to be removed)
-  find_package(GEANT3)
-  find_package(GEANT4)
-  find_package(GEANT4DATA)
-  find_package(GEANT4VMC)
-  find_package(CLHEP)
-endif (ALICEO2_MODULAR_BUILD)
+
+# Installed via CMake. Note: we work around hardcoded full paths in the CMake
+# config files not being relocated properly by appending library paths.
+guess_append_libpath(geant321 "${Geant3_DIR}")
+find_package(Geant3 NO_MODULE)
+guess_append_libpath(G4run "${Geant4_DIR}")
+find_package(Geant4 NO_MODULE)
+guess_append_libpath(geant4vmc "${GEANT4_VMC_DIR}")
+find_package(Geant4VMC NO_MODULE)
+guess_append_libpath(BaseVGM "${VGM_DIR}")
+
+find_package(VGM NO_MODULE)
 find_package(CERNLIB)
 find_package(HEPMC)
 # FIXME: the way, iwyu is integrated now conflicts with the possibility to add