merged root6

src/external/Nonlocal/CMakeLists.txt

@@ -2,17 +2,32 @@
 
 #--- generate necessary dictionaries ------------------------------------------
 set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include)
+set(NONLOCAL_INC ${CMAKE_SOURCE_DIR}/src/external/Nonlocal)
+# 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} ${NONLOCAL_INC})
 
 root_generate_dictionary(
   PNL_PippardFitterDict 
-  -I${FFTW3_INCLUDE_DIR} 
-  -I${MUSRFIT_INC}
   PNL_PippardFitter.h 
+  OPTIONS
+    -I${FFTW3_INCLUDE_DIR} 
+    -I${MUSRFIT_INC} 
+    -I${NONLOCAL_INC} 
+    -I${CMAKE_CURRENT_SOURCE_DIR}
+    -inlineInputHeader
   LINKDEF PNL_PippardFitterLinkDef.h
   MODULE PNL_PippardFitter
 )
 root_generate_dictionary(
-  PNL_StartupHandlerDict PNL_StartupHandler.h LINKDEF PNL_StartupHandlerLinkDef.h
+  PNL_StartupHandlerDict 
+  PNL_StartupHandler.h 
+  OPTIONS 
+    -I${NONLOCAL_INC} 
+    -I${CMAKE_CURRENT_SOURCE_DIR}
+    -inlineInputHeader
+  LINKDEF PNL_StartupHandlerLinkDef.h
   MODULE PNL_StartupHandler
 )
 
@@ -33,19 +48,13 @@ add_library(PNL_PippardFitter SHARED
   PNL_StartupHandler.cpp
   PNL_StartupHandlerDict.cxx
 )
-
-#--- set target properties, e.g. version --------------------------------------
-set_target_properties(PNL_PippardFitter
-  PROPERTIES
-    VERSION ${PNL_PIPPARDFITTER_VERSION}
-)
-
 #--- make sure that the include directory is found ----------------------------
 target_include_directories(
   PNL_PippardFitter BEFORE PRIVATE 
     $<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}> 
     $<BUILD_INTERFACE:${MUSRFIT_INC}>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
 )
 
 #--- set target properties, e.g. version --------------------------------------
@@ -71,7 +80,8 @@ install(
 
 #--- install PNL_PippardFitter header -----------------------------------------
 install(
-  FILES 
+  FILES
+    PNonlocal.h 
     PNL_PippardFitter.h 
     PNL_RgeHandler.h
     PNL_StartupHandler.h