merged root6

src/classes/CMakeLists.txt

@@ -2,35 +2,55 @@
 
 #--- generate necessary dictionaries ------------------------------------------
 set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include)
+# ROOT requires that the dictonary header files are found at configuration time.
+# Hence, target_include_directories cannot be used here because, targets are 
+# setup only afterwards.
+include_directories(${MUSRFIT_INC})
 
 root_generate_dictionary(
   PFourierCanvasDict 
-  -I${FFTW3_INCLUDE_DIR} ${MUSRFIT_INC}/PFourierCanvas.h 
+  PFourierCanvas.h 
+  OPTIONS 
+    -I${MUSRFIT_INC} 
+    -I${FFTW3_INCLUDE_DIR}
+    -inlineInputHeader
   LINKDEF ${MUSRFIT_INC}/PFourierCanvasLinkDef.h
   MODULE PFourierCanvas
 )
 root_generate_dictionary(
-  PMusrCanvasDict 
-  -I${Boost_INCLUDE_DIR} -I${FFTW3_INCLUDE_DIR} ${MUSRFIT_INC}/PMusrCanvas.h 
+  PMusrCanvasDict
+  PMusrCanvas.h  
   LINKDEF ${MUSRFIT_INC}/PMusrCanvasLinkDef.h
+  OPTIONS 
+    -I${Boost_INCLUDE_DIR} -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC}
+    -inlineInputHeader
   MODULE PMusrCanvas
 )
 root_generate_dictionary(
   PMusrT0Dict 
-  -I${Boost_INCLUDE_DIR} -I${FFTW3_INCLUDE_DIR} ${MUSRFIT_INC}/PMusrT0.h 
+  PMusrT0.h
   LINKDEF ${MUSRFIT_INC}/PMusrT0LinkDef.h
+  OPTIONS 
+    -I${Boost_INCLUDE_DIR} -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC}
+    -inlineInputHeader
   MODULE PMusrT0
 )
 root_generate_dictionary(
   PStartupHandlerDict 
-  -I${FFTW3_INCLUDE_DIR} ${MUSRFIT_INC}/PStartupHandler.h 
+  PStartupHandler.h 
   LINKDEF ${MUSRFIT_INC}/PStartupHandlerLinkDef.h
+  OPTIONS 
+    -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC}
+    -inlineInputHeader
   MODULE PStartupHandler
 )
 root_generate_dictionary(
-  PUserFcnBaseDict 
-  -I${FFTW3_INCLUDE_DIR} ${MUSRFIT_INC}/PUserFcnBase.h 
+  PUserFcnBaseDict
+  PUserFcnBase.h  
   LINKDEF ${MUSRFIT_INC}/PUserFcnBaseLinkDef.h
+  OPTIONS
+    -inlineInputHeader
+    -I${FFTW3_INCLUDE_DIR} -I${MUSRFIT_INC}
   MODULE PUserFcnBase
 )
 
@@ -39,7 +59,7 @@ set(prefix "${CMAKE_INSTALL_PREFIX}")
 set(exec_prefix "\$\{prefix\}")
 set(libdir "\$\{exec_prefix\}/lib")
 set(includedir "\$\{prefix\}/include")   
-set(MUSR_VERSION "1.2.0")
+set(MUSR_VERSION "1.3.0")
 set(MUSR_LIBRARY_NAME "PMusr")
 configure_file("PMusr.pc.in" "PMusr.pc" @ONLY)
 set(USERFCN_LIBRARY_NAME "PUserFcnBase")
@@ -66,6 +86,7 @@ add_library(PMusr SHARED
   PMusrT0Dict.cxx
   PPrepFourier.cpp
   PRunAsymmetry.cpp
+  PRunAsymmetryBNMR.cpp
   PRunAsymmetryRRF.cpp
   PRunBase.cpp
   PRunDataHandler.cpp
@@ -78,13 +99,6 @@ add_library(PMusr SHARED
   PStartupHandlerDict.cxx
   PTheory.cpp
 )
-
-#--- set target properties, e.g. version --------------------------------------
-set_target_properties(PMusr
-  PROPERTIES
-    VERSION ${MUSR_VERSION}
-)
-
 #--- make sure that the include directory is found ----------------------------
 target_include_directories(
   PMusr BEFORE PRIVATE
@@ -106,11 +120,14 @@ add_library(PUserFcnBase SHARED
 )
 
 #--- set target properties, e.g. version --------------------------------------
+set_target_properties(PMusr
+  PROPERTIES
+    VERSION ${MUSR_VERSION}
+)
 set_target_properties(PUserFcnBase
   PROPERTIES
     VERSION ${MUSR_VERSION}
 )
-
 #--- make sure that the include directory is found ----------------------------
 target_include_directories(
   PUserFcnBase BEFORE PRIVATE $<BUILD_INTERFACE:${MUSRFIT_INC}>
@@ -174,15 +191,31 @@ install(
 )
 
 #--- install headers ----------------------------------------------------------
-#--- only install headers needed for classes with dictionary
 install(
-  FILES ${MUSRFIT_INC}/PFourierCanvas.h
+  FILES ${MUSRFIT_INC}/PFitterFcn.h
+        ${MUSRFIT_INC}/PFitter.h
+        ${MUSRFIT_INC}/PFourierCanvas.h
         ${MUSRFIT_INC}/PFourier.h 
+        ${MUSRFIT_INC}/PFunctionGrammar.h
+        ${MUSRFIT_INC}/PFunction.h
+        ${MUSRFIT_INC}/PFunctionHandler.h
+        ${MUSRFIT_INC}/PMsr2Data.h
+        ${MUSRFIT_INC}/PMsrHandler.h
         ${MUSRFIT_INC}/PMusrCanvas.h
         ${MUSRFIT_INC}/PMusr.h
         ${MUSRFIT_INC}/PMusrT0.h
+        ${MUSRFIT_INC}/PPrepFourier.h
+        ${MUSRFIT_INC}/PRunAsymmetry.h
+        ${MUSRFIT_INC}/PRunAsymmetryRRF.h
+        ${MUSRFIT_INC}/PRunBase.h
+        ${MUSRFIT_INC}/PRunDataHandler.h
         ${MUSRFIT_INC}/PRunListCollection.h
+        ${MUSRFIT_INC}/PRunMuMinus.h
+        ${MUSRFIT_INC}/PRunNonMusr.h
+        ${MUSRFIT_INC}/PRunSingleHisto.h
+        ${MUSRFIT_INC}/PRunSingleHistoRRF.h
         ${MUSRFIT_INC}/PStartupHandler.h
+        ${MUSRFIT_INC}/PTheory.h
         ${MUSRFIT_INC}/PUserFcnBase.h
   DESTINATION include
 )