better hdf4/5 include handling.

CMakeLists.txt

@@ -243,7 +243,6 @@ if (nexus)
       message(FATAL_ERROR "HDF4 library not found. Please install libhdf4-dev or hdf-devel")
     endif()
 
-    include_directories(${HDF4_INCLUDE_DIRS})
     add_definitions(-DHAVE_HDF4)
   endif (HAVE_HDF4)  
   add_definitions(-DPNEXUS_ENABLED)

src/CMakeLists.txt

@@ -50,7 +50,8 @@ target_compile_options(dump_header BEFORE PRIVATE "-DHAVE_CONFIG_H" "${HAVE_GIT_
 target_include_directories(dump_header 
   BEFORE PRIVATE 
     $<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>
-    $<BUILD_INTERFACE:${NEXUS_INCLUDE_DIR}>
+    $<BUILD_INTERFACE:${HDF4_INCLUDE_DIRS}>
+    $<BUILD_INTERFACE:${HDF5_INCLUDE_DIRS}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
     $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>

src/classes/CMakeLists.txt

@@ -131,7 +131,8 @@ target_include_directories(
   PMusr BEFORE PRIVATE
     $<BUILD_INTERFACE:${Boost_INCLUDE_DIR}>
     $<BUILD_INTERFACE:${FFTW3_INCLUDE}> 
-    $<BUILD_INTERFACE:${NEXUS_INCLUDE_DIR}>
+    $<BUILD_INTERFACE:${HDF4_INCLUDE_DIRS}>
+    $<BUILD_INTERFACE:${HDF5_INCLUDE_DIRS}>
     $<BUILD_INTERFACE:${MUSRFIT_INC}>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/MusrRoot>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/external/TLemRunHeader>

src/external/nexus/CMakeLists.txt

@@ -1,7 +1,5 @@
 # - PNeXus library ------------------------------------------------------------
 
-include_directories(${NEXUS_INCLUDE_DIR}) # to get the nexus headers
-
 #--- create pkg-config info ---------------------------------------------------
 set(prefix "${CMAKE_INSTALL_PREFIX}")   
 set(exec_prefix "\$\{prefix\}")
@@ -23,8 +21,10 @@ set_target_properties(PNeXus
 )
 
 #--- make sure that the include directory is found ----------------------------
-target_include_directories(
-  PNeXus BEFORE PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+target_include_directories(PNeXus 
+  BEFORE PRIVATE $<BUILD_INTERFACE:${HDF4_INCLUDE_DIRS}>
+  BEFORE PRIVATE $<BUILD_INTERFACE:${HDF5_INCLUDE_DIRS}>
+  BEFORE PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
 
 #--- add library dependencies -------------------------------------------------
@@ -33,7 +33,7 @@ if (HAVE_HDF4)
 else (HAVE_HDF4)   
   set(HDF_LIBS ${HDF5_LIBRARIES})
 endif (HAVE_HDF4)
-message(STATUS "++>> HDF_LIBS: ${HDF_LIBS}")
+message(STATUS "as35> HDF_LIBS: ${HDF_LIBS}")
 target_link_libraries(PNeXus ${HDF_LIBS} ${ROOT_LIBRARIES})
 
 #--- install PNeXus solib -----------------------------------------------------