From 39fbaea1c681e946786967695d4ec22002a5fb06 Mon Sep 17 00:00:00 2001
From: adrien-matta <a.matta@surrey.ac.uk>
Date: Thu, 2 Apr 2015 16:34:59 +0100
Subject: [PATCH] * Fixing various CMakeList
---
NPLib/Core/CMakeLists.txt | 4 +++-
NPLib/InitialConditions/CMakeLists.txt | 1 +
NPLib/InteractionCoordinates/CMakeLists.txt | 3 ++-
NPLib/Maya/CMakeLists.txt | 2 ++
NPLib/Physics/CMakeLists.txt | 2 +-
5 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/NPLib/Core/CMakeLists.txt b/NPLib/Core/CMakeLists.txt
index affedde0f..aa1306bd0 100644
--- a/NPLib/Core/CMakeLists.txt
+++ b/NPLib/Core/CMakeLists.txt
@@ -1,4 +1,6 @@
-
+add_custom_command(OUTPUT TAsciiFileDict.cxx TAsciiFileDict_rdict.pcm TAsciiFile.rootmap COMMAND ../scripts/build_dict.sh TAsciiFile.h TAsciiFileDict.cxx TAsciiFile.rootmap libNPCore.so)
+add_custom_command(OUTPUT NPVDetectorDict.cxx NPVDetectorDict_rdict.pcm NPVDetector.rootmap COMMAND ../scripts/build_dict.sh NPVDetector.h NPVDetectorDict.cxx NPVDetector.rootmap libNPCore.so NPCoreLinkdef.h)
+
add_library(NPCore SHARED NPVAnalysis.cxx NPAnalysisFactory.cxx NPCalibrationManager.cxx NPOptionManager.cxx RootOutput.cxx RootInput.cxx TAsciiFile.cxx TAsciiFileDict.cxx NPDetectorManager.cxx NPVDetector.cxx NPVDetectorDict.cxx NPVSpectra.cxx NPDetectorFactory.cxx)
target_link_libraries(NPCore ${ROOT_LIBRARIES})
install(FILES NPVAnalysis.h NPAnalysisFactory.h NPCalibrationManager.h NPOptionManager.h RootInput.h RootOutput.h TAsciiFile.h NPDetectorManager.h NPVDetector.h NPGlobalSystemOfUnits.h NPPhysicalConstants.h NPSystemOfUnits.h NPVSpectra.h NPDetectorFactory.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/InitialConditions/CMakeLists.txt b/NPLib/InitialConditions/CMakeLists.txt
index 7ec8654f0..7ab9fcf83 100644
--- a/NPLib/InitialConditions/CMakeLists.txt
+++ b/NPLib/InitialConditions/CMakeLists.txt
@@ -1,3 +1,4 @@
+add_custom_command(OUTPUT TInitialConditionsDict.cxx TInitialConditionsDict_rdict.pcm TInitialConditions.rootmap COMMAND ../scripts/build_dict.sh TInitialConditions.h TInitialConditionsDict.cxx TInitialConditions.rootmap libNPInitialConditions.so)
add_library(NPInitialConditions SHARED TInitialConditions.cxx TInitialConditionsDict.cxx )
target_link_libraries(NPInitialConditions ${ROOT_LIBRARIES} NPCore)
install(FILES TInitialConditions.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
diff --git a/NPLib/InteractionCoordinates/CMakeLists.txt b/NPLib/InteractionCoordinates/CMakeLists.txt
index 91f8b3ebb..d0a5de25f 100644
--- a/NPLib/InteractionCoordinates/CMakeLists.txt
+++ b/NPLib/InteractionCoordinates/CMakeLists.txt
@@ -1,4 +1,5 @@
-add_library(NPInteractionCoordinates SHARED TInteractionCoordinates.cxx TInteractionCoordinatesDict.cxx )
+add_custom_command(OUTPUT TInteractionCoordinatesDict.cxx TInteractionCoordinatesDict_rdict.pcm TInteractionCoordinates.rootmap COMMAND ../scripts/build_dict.sh TInteractionCoordinates.h TInteractionCoordinatesDict.cxx TInteractionCoordinates.rootmap libNPInteractionCoordinates.so)
+ add_library(NPInteractionCoordinates SHARED TInteractionCoordinates.cxx TInteractionCoordinatesDict.cxx )
target_link_libraries(NPInteractionCoordinates ${ROOT_LIBRARIES} NPCore)
install(FILES TInteractionCoordinates.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
install(FILES TInteractionCoordinatesDict_rdict.pcm TInteractionCoordinates.rootmap DESTINATION ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
diff --git a/NPLib/Maya/CMakeLists.txt b/NPLib/Maya/CMakeLists.txt
index 5dbd4ea51..4bde46a81 100644
--- a/NPLib/Maya/CMakeLists.txt
+++ b/NPLib/Maya/CMakeLists.txt
@@ -1,4 +1,6 @@
add_custom_command(OUTPUT TMayaDataDict.cxx TMayaDataDict_rdict.pcm TMayaData.rootmap COMMAND ../scripts/build_dict.sh TMayaData.h TMayaDataDict.cxx TMayaData.rootmap libNPMaya.dylib DEPENDS TMayaData.h)
+add_custom_command(OUTPUT TMayaHistoDict.cxx TMayaHistoDict_rdict.pcm TMayaHisto.rootmap COMMAND ../scripts/build_dict.sh TMayaHisto.h TMayaHistoDict.cxx TMayaHisto.rootmap libNPMaya.dylib DEPENDS TMayaHisto.h)
+
add_library(NPMaya SHARED TMayaData.cxx TMayaHisto.cxx TMayaDataDict.cxx TMayaHistoDict.cxx ConfigReader.cxx)
target_link_libraries(NPMaya ${ROOT_LIBRARIES} NPCore)
diff --git a/NPLib/Physics/CMakeLists.txt b/NPLib/Physics/CMakeLists.txt
index 5b99a66fb..6cded4e5c 100644
--- a/NPLib/Physics/CMakeLists.txt
+++ b/NPLib/Physics/CMakeLists.txt
@@ -1,4 +1,4 @@
-
+add_custom_command(OUTPUT NPReactionDict.cxx NPReaction.rootmap NPReactionDict_rdict.pcm COMMAND ../scripts/build_dict.sh NPReaction.h NPReactionDict.cxx NPReaction.rootmap libNPPhysics.so NPPhysicsLinkDef.h)
add_library(NPPhysics SHARED NPBeam.cxx NPEnergyLoss.cxx NPFunction.cxx NPNucleus.cxx NPReaction.cxx NPReactionDict.cxx)
target_link_libraries(NPPhysics ${ROOT_LIBRARIES} MathMore NPCore)
install(FILES NPBeam.h NPEnergyLoss.h NPFunction.h NPNucleus.h NPReaction.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
--
GitLab