Skip to content
Snippets Groups Projects
Commit 57f9e1d7 authored by adrien-matta's avatar adrien-matta
Browse files

* Fidling around with root linking

parent da4b22f3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
NPAnalysis/S1554/Calibration.txt
+ 1
− 1
View file @ 57f9e1d7
...@@ -2,4 +2,4 @@ CalibrationFilePath ...@@ -2,4 +2,4 @@ CalibrationFilePath
SharcCalibration.txt SharcCalibration.txt
SharcPixelCalibration.txt SharcPixelCalibration.txt
SharcPixelDeadLayer.txt SharcPixelDeadLayer.txt
TigressCalibration.txt TigressCalibration_Ryan.txt
NPLib/Core/CMakeLists.txt
+ 1
− 1
View file @ 57f9e1d7
add_custom_command(OUTPUT TAsciiFileDict.cxx COMMAND ../scripts/build_dict.sh TAsciiFile.h TAsciiFileDict.cxx TAsciiFile.rootmap libNPCore.so) add_custom_command(OUTPUT TAsciiFileDict.cxx COMMAND ../scripts/build_dict.sh TAsciiFile.h TAsciiFileDict.cxx TAsciiFile.rootmap libNPCore.so)
add_custom_command(OUTPUT NPVDetectorDict.cxx COMMAND ../scripts/build_dict.sh NPVDetector.h NPVDetectorDict.cxx NPVDetector.rootmap libNPCore.so NPCoreLinkdef.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 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 NPSpectraServer.cxx ) 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 NPSpectraServer.cxx )
target_link_libraries(NPCore ${ROOT_LIBRARIES} -lGpad) 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 NPSpectraServer.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY}) 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 NPSpectraServer.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
NPLib/Maya/CMakeLists.txt
+ 1
− 1
View file @ 57f9e1d7
...@@ -4,7 +4,7 @@ add_custom_command(OUTPUT TMayaHistoDict.cxx COMMAND ../scripts/build_dict.sh TM ...@@ -4,7 +4,7 @@ add_custom_command(OUTPUT TMayaHistoDict.cxx COMMAND ../scripts/build_dict.sh TM
add_library(NPMaya SHARED TMayaData.cxx TMayaHisto.cxx TMayaDataDict.cxx TMayaHistoDict.cxx ConfigReader.cxx) add_library(NPMaya SHARED TMayaData.cxx TMayaHisto.cxx TMayaDataDict.cxx TMayaHistoDict.cxx ConfigReader.cxx)
target_link_libraries(NPMaya ${ROOT_LIBRARIES} NPCore) target_link_libraries(NPMaya ${ROOT_LIBRARIES} -lGraf NPCore)
install(FILES TMayaData.h TMayaHisto.h ConfigReader.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY}) install(FILES TMayaData.h TMayaHisto.h ConfigReader.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
endif() endif()
NPLib/Root.cmake
+ 4
− 3
View file @ 57f9e1d7
...@@ -43,17 +43,18 @@ string(REPLACE "-lGui" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}") ...@@ -43,17 +43,18 @@ string(REPLACE "-lGui" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}")
#string(REPLACE "-lRIO" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}") #string(REPLACE "-lRIO" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}")
#string(REPLACE "-lNet" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}") #string(REPLACE "-lNet" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}")
#string(REPLACE "-lHist" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}") #string(REPLACE "-lHist" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}")
#string(REPLACE "-lGraf " " " ROOT_LIBRARIES "${ROOT_LIBRARIES}") string(REPLACE "-lGraf " " " ROOT_LIBRARIES "${ROOT_LIBRARIES}")
string(REPLACE "-lGraf3d" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}") string(REPLACE "-lGraf3d" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}")
string(REPLACE "-lGpad" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}") #string(REPLACE "-lGpad" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}")
#string(REPLACE "-lTree" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}") #string(REPLACE "-lTree" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}")
string(REPLACE "-lRint" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}") string(REPLACE "-lRint" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}")
string(REPLACE "-lPostScript" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}") string(REPLACE "-lPostscript" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}")
string(REPLACE "-lMatrix" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}") string(REPLACE "-lMatrix" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}")
#string(REPLACE "-lPhysics" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}") #string(REPLACE "-lPhysics" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}")
#string(REPLACE "-lMathCore" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}") #string(REPLACE "-lMathCore" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}")
string(REPLACE "-lThread" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}") string(REPLACE "-lThread" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}")
string(REPLACE "-lpthread" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}") string(REPLACE "-lpthread" "" ROOT_LIBRARIES "${ROOT_LIBRARIES}")
message("${ROOT_LIBRARIES}")
# Lib directories # Lib directories
exec_program(${NPTOOL_ROOT_CONFIG} ARGS "--libdir" OUTPUT_VARIABLE ROOT_LIBRARY_DIR) exec_program(${NPTOOL_ROOT_CONFIG} ARGS "--libdir" OUTPUT_VARIABLE ROOT_LIBRARY_DIR)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment