* Making change so NPS follow the same logic as NPLib

NPLib/AnnularS2/CMakeLists.txt

 add_custom_command(OUTPUT TS2PhysicsDict.cxx TS2PhysicsDict_rdict.pcm TS2Physics.rootmap COMMAND ../scripts/build_dict.sh TS2Physics.h TS2PhysicsDict.cxx TS2Physics.rootmap libNPAnnularS2.dylib DEPENDS TS2Physics.h)
 add_custom_command(OUTPUT TS2DataDict.cxx TS2DataDict_rdict.pcm TS2Data.rootmap COMMAND ../scripts/build_dict.sh TS2Data.h TS2DataDict.cxx TS2Data.rootmap libNPAnnularS2.dylib DEPENDS TS2Data.h)
-add_library(NPS2 SHARED TS2Data.cxx TS2Physics.cxx TS2DataDict.cxx TS2PhysicsDict.cxx )
-target_link_libraries(NPS2 ${ROOT_LIBRARIES} NPCore) 
+add_library(NPAnnularS2 SHARED TS2Data.cxx TS2Physics.cxx TS2DataDict.cxx TS2PhysicsDict.cxx )
+target_link_libraries(NPAnnularS2 ${ROOT_LIBRARIES} NPCore) 
 install(FILES TS2Data.h TS2Physics.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
 

NPLib/CMakeLists.txt

@@ -71,17 +71,23 @@ ENDMACRO()
 # Call the Macro
 subdirlist(SUB_DIRECTORY ${CMAKE_BINARY_DIR})
 set(SUB_DIRECTORY ${SUB_DIRECTORY} Core Physics InitialConditions InteractionCoordinates Utility)
-# Add each folder in the include path
-#foreach(subdir ${SUB_DIRECTORY})
-#  # Allow inclusion of project headers
-#  include_directories(${subdir})
-#endforeach() 
 include_directories("Core/")
 
 # Add each sub folder to the project
+set(TARGET_LIST "")
 foreach(subdir ${SUB_DIRECTORY})
 # add the subdirectory
-  add_subdirectory(${subdir}) 
+  add_subdirectory(${subdir})
+  string(COMPARE EQUAL "${subdir}" "Utility" r0)
+  if(NOT r0)
+    LIST(APPEND TARGET_LIST NP${subdir})
+  endif()
 endforeach()
 
+export(TARGETS ${TARGET_LIST} FILE NPLibTargets.cmake)
+export(PACKAGE NPLib)
+file(RELATIVE_PATH REL_INCLUDE_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" "${CMAKE_INCLUDE_OUTPUT_DIRECTORY}")
+set(CONF_INCLUDE_DIRS "./" "./")
+configure_file(NPLibConfig.cmake.in "${PROJECT_BINARY_DIR}/NPLibConfig.cmake" @ONLY)
+
 install(SCRIPT scripts/post_install.cmake ${DETLIST})

NPLib/Core/RootInput.cxx

@@ -132,7 +132,7 @@ RootInput::RootInput(string configFileName){
       }
     }
     if( pRootChain->GetEntries() ==0){
-      cout << "\033[1;31m ERROR: No entries to analyse\033[0m" << endl; 
+      cout << "\033[1;31m**** ERROR: No entries to analyse ****\033[0m" << endl; 
       exit(1);
     }
     else{

NPLib/Core/RootOutput.cxx

@@ -49,8 +49,7 @@ void RootOutput::Destroy(){
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-RootOutput::RootOutput(TString fileNameBase, TString treeNameBase)
-{
+RootOutput::RootOutput(TString fileNameBase, TString treeNameBase){
    TDirectory* currentPath= gDirectory;
 
    // The file extension is added to the file name:
@@ -85,8 +84,7 @@ RootOutput::RootOutput(TString fileNameBase, TString treeNameBase)
 
 
 ////////////////////////////////////////////////////////////////////////////////
-void RootOutput::InitAsciiFiles()
-{
+void RootOutput::InitAsciiFiles(){
    // get NPOptionManager pointer
    NPOptionManager* OptionManager  = NPOptionManager::getInstance();
 
@@ -126,9 +124,8 @@ void RootOutput::InitAsciiFiles()
 }
 
 
-
-RootOutput::~RootOutput()
-{ 
+////////////////////////////////////////////////////////////////////////////////
+RootOutput::~RootOutput(){ 
     // The data is written to the file and the tree is closed:
     if (pRootFile && !NPOptionManager::getInstance()->GetPROOF()) {
       TDirectory* currentPath= gDirectory;

NPLib/DummyDetector/CMakeLists.txt

 add_custom_command(OUTPUT TDUMMYDetectorDataDict.cxx TDUMMYDetectorDataDict_rdict.pcm TDUMMYDetectorData.rootmap COMMAND ../scripts/build_dict.sh TDUMMYDetectorData.h TDUMMYDetectorDataDict.cxx TDUMMYDetectorData.rootmap libNPDummyDetector.dylib DEPENDS TDUMMYDetectorData.h)
-add_library(NPDUMMYDetector SHARED TDUMMYDetectorData.cxx TDUMMYDetectorDataDict.cxx )
-target_link_libraries(NPDUMMYDetector ${ROOT_LIBRARIES} NPCore) 
+add_library(NPDummyDetector SHARED TDUMMYDetectorData.cxx TDUMMYDetectorDataDict.cxx )
+target_link_libraries(NPDummyDetector ${ROOT_LIBRARIES} NPCore) 
 install(FILES TDUMMYDetectorData.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
 

NPLib/HYDE2/CMakeLists.txt

 add_custom_command(OUTPUT THyde2TrackerPhysicsDict.cxx THyde2TrackerPhysicsDict_rdict.pcm THyde2TrackerPhysics.rootmap COMMAND ../scripts/build_dict.sh THyde2TrackerPhysics.h THyde2TrackerPhysicsDict.cxx THyde2TrackerPhysics.rootmap libNPHYDE2.dylib DEPENDS THyde2TrackerPhysics.h)
 add_custom_command(OUTPUT THyde2TrackerDataDict.cxx THyde2TrackerDataDict_rdict.pcm THyde2TrackerData.rootmap COMMAND ../scripts/build_dict.sh THyde2TrackerData.h THyde2TrackerDataDict.cxx THyde2TrackerData.rootmap libNPHYDE2.dylib DEPENDS THyde2TrackerData.h)
-add_library(NPHyde2Tracker SHARED Hyde2Tracker.cxx Hyde2TrackerModule.cxx Hyde2TrackerTrapezoid1.cxx Hyde2TrackerTrapezoid2.cxx Hyde2TrackerSquare1.cxx THyde2TrackerData.cxx THyde2TrackerPhysics.cxx THyde2TrackerDataDict.cxx THyde2TrackerPhysicsDict.cxx )
-target_link_libraries(NPHyde2Tracker ${ROOT_LIBRARIES} NPCore) 
+add_library(NPHYDE2 SHARED Hyde2Tracker.cxx Hyde2TrackerModule.cxx Hyde2TrackerTrapezoid1.cxx Hyde2TrackerTrapezoid2.cxx Hyde2TrackerSquare1.cxx THyde2TrackerData.cxx THyde2TrackerPhysics.cxx THyde2TrackerDataDict.cxx THyde2TrackerPhysicsDict.cxx )
+target_link_libraries(NPHYDE2 ${ROOT_LIBRARIES} NPCore) 
 install(FILES THyde2TrackerData.h THyde2TrackerPhysics.h Hyde2Tracker.h Hyde2TrackerModule.h Hyde2TrackerSquare1.h Hyde2TrackerTrapezoid1.h Hyde2TrackerTrapezoid2.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
 

NPLib/HiRA/CMakeLists.txt

 add_custom_command(OUTPUT THiraDataDict.cxx THiraDataDict_rdict.pcm THiraData.rootmap COMMAND ../scripts/build_dict.sh THiraData.h THiraDataDict.cxx THiraData.rootmap libNPHiRA.dylib DEPENDS THiraData.h)
-add_library(NPHira SHARED THiraData.cxx THiraDataDict.cxx )
-target_link_libraries(NPHira ${ROOT_LIBRARIES} NPCore) 
+add_library(NPHiRA SHARED THiraData.cxx THiraDataDict.cxx )
+target_link_libraries(NPHiRA ${ROOT_LIBRARIES} NPCore) 
 install(FILES THiraData.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})
 

NPLib/NPLibConfig.cmake.in

+# - Config file for the NPLib package
+# It defines the following variables
+#  NPLib_INCLUDE_DIRS - include directories for NPLib
+#  NPLib_LIBRARIES    - libraries to link against
+#  NPLib_EXECUTABLE   - the bar executable
+ 
+# Compute paths
+get_filename_component(NPLib_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+set(NPLib_INCLUDE_DIRS "@CMAKE_INCLUDE_OUTPUT_DIRECTORY@")
+include_directories("${NPLib_INCLUDE_DIRS}")
+set(NPLib_USE_FILE "@CMAKE_BINARY_DIR@/NPLibConfig.cmake")
+# These are IMPORTED targets created by NPLibTargets.cmake
+set(NPLib_LIBRARIES "@TARGET_LIST@")
+set(NPLib_EXECUTABLE npanalysis nptool-installer)

NPLib/Riken/CMakeLists.txt

 add_custom_command(OUTPUT TRIPSDataDict.cxx TRIPSDataDict_rdict.pcm TRIPSData.rootmap COMMAND ../scripts/build_dict.sh TRIPSData.h TRIPSDataDict.cxx TRIPSData.rootmap libNPRiken.dylib DEPENDS TRIPSData.h)
-add_library(NPRIPS SHARED TRIPSData.cxx TRIPSDataDict.cxx )
-target_link_libraries(NPRIPS ${ROOT_LIBRARIES} NPCore) 
+add_library(NPRiken SHARED TRIPSData.cxx TRIPSDataDict.cxx )
+target_link_libraries(NPRiken ${ROOT_LIBRARIES} NPCore) 
 install(FILES TRIPSData.h DESTINATION ${CMAKE_INCLUDE_OUTPUT_DIRECTORY})