Apply fixes after rebasing

Added yaml-cpp requirement to main CMakeLists. Changed include order in Tutorial1 macro. Removed endl from LOG(info) in FairYamlVMCConfig.
FairRootGroup · Sep 12, 2022 · 0e602c3 · 0e602c3
1 parent 0a43580
commit 0e602c3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -222,7 +222,7 @@ set(FAIRROOT_LIBRARY_PROPERTIES ${FAIRROOT_LIBRARY_PROPERTIES}
 )
 set(PROJECT_LIBRARY_PROPERTIES ${FAIRROOT_LIBRARY_PROPERTIES})
 
-find_package2(PUBLIC yaml-cpp)
+find_package2(PUBLIC yaml-cpp REQUIRED)
 # Workaround missing exported include directories
 # Upstream has fixed this in https://github.com/jbeder/yaml-cpp/commit/ab5f9259a4e67d3fe0e4832bd407a9e596e2d884 (since 0.6.3)
 if(yaml-cpp_FOUND)

diff --git a/examples/simulation/Tutorial1/macros/run_tutorial1_binary.C b/examples/simulation/Tutorial1/macros/run_tutorial1_binary.C
@@ -6,8 +6,6 @@
  *                  copied verbatim in the file "LICENSE"                       *
  ********************************************************************************/
 
-#if !defined(__CLING__) || defined(__ROOTCLING__)
-#include <iostream>
 #include "FairBoxGenerator.h"
 #include "FairCave.h"
 #include "FairParRootFileIo.h"
@@ -22,6 +20,9 @@
 #include <TRandom3.h>
 #include <TStopwatch.h>
 
+#if !defined(__CLING__) || defined(__ROOTCLING__)
+#include <iostream>
+
 using std::cout;
 using std::endl;
 #endif

diff --git a/fairtools/MCConfigurator/FairYamlVMCConfig.cxx b/fairtools/MCConfigurator/FairYamlVMCConfig.cxx
@@ -69,7 +69,7 @@ void FairYamlVMCConfig::SetupPostInit(const char* mcEngine)
     if (!((strcmp(mcEngine, "TGeant4") == 0))) {
         LOG(fatal) << "FairYamlVMCConfig::SetupPostInit() only valid for TGeant4.";
     }
-    LOG(info) << "Loading Geant4 PostInit Config." << endl;
+    LOG(info) << "Loading Geant4 PostInit Config.";
 
     TString work = getenv("VMCWORKDIR");
     TString work_config = work + "/gconfig/";