From df8d61e40921a748a1139990337af2c94de536d9 Mon Sep 17 00:00:00 2001 From: adrien matta <matta@lpccaen.in2p3.fr> Date: Tue, 16 May 2017 17:12:28 +0200 Subject: [PATCH] * Fixing DeltaSpectra Link Def with Root 5 --- NPLib/Core/CMakeLists.txt | 2 +- NPLib/Core/NPCoreLinkdef.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/NPLib/Core/CMakeLists.txt b/NPLib/Core/CMakeLists.txt index 47a08e5cd..4ae28e24d 100644 --- a/NPLib/Core/CMakeLists.txt +++ b/NPLib/Core/CMakeLists.txt @@ -1,5 +1,5 @@ add_custom_command(OUTPUT TAsciiFileDict.cxx COMMAND ../scripts/build_dict.sh TAsciiFile.h TAsciiFileDict.cxx TAsciiFile.rootmap libNPCore.so) -add_custom_command(OUTPUT NPDeltaSpectraDict.cxx COMMAND ../scripts/build_dict.sh NPDeltaSpectra.h NPDeltaSpectraDict.cxx NPDeltaSpectra.rootmap libNPCore.so NPCoreLinkdef.h) +add_custom_command(OUTPUT NPDeltaSpectraDict.cxx COMMAND ../scripts/build_dict.sh NPDeltaSpectra.h NPDeltaSpectraDict.cxx NPDeltaSpectra.rootmap libNPCore.so NPDeltaSpectraLinkdef.h) add_custom_command(OUTPUT NPVDetectorDict.cxx COMMAND ../scripts/build_dict.sh NPVDetector.h NPVDetectorDict.cxx NPVDetector.rootmap libNPCore.so NPCoreLinkdef.h) add_library(NPCore SHARED NPCore.cxx NPVAnalysis.cxx NPAnalysisFactory.cxx NPCalibrationManager.cxx NPOptionManager.cxx RootOutput.cxx RootInput.cxx TAsciiFile.cxx TAsciiFileDict.cxx NPDeltaSpectraDict.cxx NPDetectorManager.cxx NPVDetector.cxx NPVDetectorDict.cxx NPVSpectra.cxx NPDetectorFactory.cxx NPSpectraServer.cxx NPInputParser.cxx NPImage.cxx NPElog.cxx NPDeltaSpectra.cxx) diff --git a/NPLib/Core/NPCoreLinkdef.h b/NPLib/Core/NPCoreLinkdef.h index e189b34bd..4770cb4c9 100644 --- a/NPLib/Core/NPCoreLinkdef.h +++ b/NPLib/Core/NPCoreLinkdef.h @@ -1,5 +1,3 @@ #ifdef __CINT__ -//#pragma link C++ defined_in "NPVDetector.h"; #pragma link C++ class NPL::VDetector+; -#pragma link C++ class NPL::DeltaSpectra+; #endif -- GitLab