Skip to content

Commit d45447b

Browse files
committed
Apply fixes after rebasing
CMakeLists in pixel and Tutorial1: added gconfig dir. Changed include order in Tutorial1 macro. Removed endl from LOG(info) in FairYamlVMCConfig.
1 parent c2f7a81 commit d45447b

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

examples/MQ/pixelDetector/src/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ set_property(TARGET ${target} PROPERTY POSITION_INDEPENDENT_CODE ON)
6161

6262
target_include_directories(${target} PUBLIC
6363
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
64+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/examples/common/gconfig>
6465
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/devices>
6566
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
6667
)

examples/simulation/Tutorial1/macros/run_tutorial1_binary.C

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
* copied verbatim in the file "LICENSE" *
77
********************************************************************************/
88

9-
#if !defined(__CLING__) || defined(__ROOTCLING__)
10-
#include <iostream>
119
#include "FairBoxGenerator.h"
1210
#include "FairCave.h"
1311
#include "FairParRootFileIo.h"
@@ -22,6 +20,9 @@
2220
#include <TRandom3.h>
2321
#include <TStopwatch.h>
2422

23+
#if !defined(__CLING__) || defined(__ROOTCLING__)
24+
#include <iostream>
25+
2526
using std::cout;
2627
using std::endl;
2728
#endif

examples/simulation/Tutorial1/src/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ set_target_properties(${target} PROPERTIES ${PROJECT_LIBRARY_PROPERTIES})
2727

2828
target_include_directories(${target} PUBLIC
2929
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
30+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/examples/common/gconfig>
3031
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
3132
)
3233

fairtools/MCConfigurator/FairYamlVMCConfig.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void FairYamlVMCConfig::SetupPostInit(const char* mcEngine)
6969
if (!((strcmp(mcEngine, "TGeant4") == 0))) {
7070
LOG(fatal) << "FairYamlVMCConfig::SetupPostInit() only valid for TGeant4.";
7171
}
72-
LOG(info) << "Loading Geant4 PostInit Config." << endl;
72+
LOG(info) << "Loading Geant4 PostInit Config.";
7373

7474
TString work = getenv("VMCWORKDIR");
7575
TString work_config = work + "/gconfig/";

0 commit comments

Comments
 (0)