diff --git a/NPLib/Core/CMakeLists.txt b/NPLib/Core/CMakeLists.txt index aa1306bd020453719b3d2ef5e08114794d242ae4..963b7351a89ffd43ba0c9374e5f81071cc1220bf 100644 --- a/NPLib/Core/CMakeLists.txt +++ b/NPLib/Core/CMakeLists.txt @@ -1,6 +1,5 @@ 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/scripts/build_dict.sh b/NPLib/scripts/build_dict.sh index dfb6e0c23134676b81fe4667c3db53dbe01a12cd..2064d315c3e27399cc0e1ae9b656603a8af3a7bb 100755 --- a/NPLib/scripts/build_dict.sh +++ b/NPLib/scripts/build_dict.sh @@ -50,7 +50,7 @@ fi # Version 5 : generate the dictionnary then the libmap if [ $version_major -eq 5 ] then - rootcint -f $2 -c -I../Core $1 + rootcint -f $2 -c -I../Core $1 $5 fi # Version 6 or more : generate both at once