merged root6

src/external/MusrRoot/CMakeLists.txt

@@ -1,8 +1,19 @@
 # - TMusrRunHeader library ----------------------------------------------------
 
 #--- generate necessary dictionaries ------------------------------------------
+set(MUSRROOT_INC ${CMAKE_SOURCE_DIR}/src/external/MusrRoot)
+# 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(${CMAKE_CURRENT_SOURCE_DIR})
+
 root_generate_dictionary(
-  TMusrRunHeaderDict TMusrRunHeader.h LINKDEF TMusrRunHeaderLinkDef.h
+  TMusrRunHeaderDict 
+  TMusrRunHeader.h 
+  OPTIONS 
+    -I${MUSRROOT_INC}
+    -inlineInputHeader
+  LINKDEF TMusrRunHeaderLinkDef.h
   MODULE TMusrRunHeader
 )
 
@@ -20,6 +31,10 @@ add_library(TMusrRunHeader SHARED
   TMusrRunHeader.cpp
   TMusrRunHeaderDict.cxx
 )
+#--- make sure that the include directory is found ----------------------------
+target_include_directories(
+  TMusrRunHeader BEFORE PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
 
 #--- set target properties, e.g. version --------------------------------------
 set_target_properties(TMusrRunHeader
@@ -27,11 +42,6 @@ set_target_properties(TMusrRunHeader
     VERSION ${MUSR_ROOT_VERSION}
 )
 
-#--- make sure that the include directory is found ----------------------------
-target_include_directories(
-  TMusrRunHeader BEFORE PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-)
-
 #--- add library dependencies -------------------------------------------------
 target_link_libraries(TMusrRunHeader ${ROOT_LIBRARIES})