From 60606bc3a3ac923cc62c67af3bc8b6333014de8b Mon Sep 17 00:00:00 2001
From: adrien matta <matta@lpccaen.in2p3.fr>
Date: Thu, 2 Nov 2017 09:59:24 +0100
Subject: [PATCH] * Fixing compilation issue with Modular Leaf on recent Mac Os
X
---
NPLib/Detectors/ModularLeaf/CMakeLists.txt | 3 ++-
NPLib/Detectors/ModularLeaf/TModularLeafPhysics.cxx | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/NPLib/Detectors/ModularLeaf/CMakeLists.txt b/NPLib/Detectors/ModularLeaf/CMakeLists.txt
index 89ce7b70c..6a32ba0c2 100644
--- a/NPLib/Detectors/ModularLeaf/CMakeLists.txt
+++ b/NPLib/Detectors/ModularLeaf/CMakeLists.txt
@@ -1,4 +1,5 @@
-add_library(NPModularLeaf SHARED TModularLeafPhysics.cxx)
+add_custom_command(OUTPUT TModularLeafPhysicsDict.cxx COMMAND ../../scripts/build_dict.sh TModularLeafPhysics.h TModularLeafPhysicsDict.cxx TModularLeafPhysics.rootmap libNPModularLeaf.dylib DEPENDS TModularLeafPhysics.h)
+add_library(NPModularLeaf SHARED TModularLeafPhysics.cxx TModularLeafPhysicsDict.cxx)
target_link_libraries(NPModularLeaf ${ROOT_LIBRARIES} NPCore)
install(FILES TModularLeafPhysics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/Detectors/ModularLeaf/TModularLeafPhysics.cxx b/NPLib/Detectors/ModularLeaf/TModularLeafPhysics.cxx
index a482a8962..67d19448a 100644
--- a/NPLib/Detectors/ModularLeaf/TModularLeafPhysics.cxx
+++ b/NPLib/Detectors/ModularLeaf/TModularLeafPhysics.cxx
@@ -176,6 +176,6 @@ class proxy_modularleaf{
}
};
-proxy_modularleaf p;
+proxy_modularleaf p_modularleaf;
}
--
GitLab