1 files changed, 38 insertions, 30 deletions
diff --git a/config/cmake/hdf5-config.cmake.build.in b/config/cmake/hdf5-config.cmake.build.in
index 132e8be..ecbde48 100644
--- a/config/cmake/hdf5-config.cmake.build.in
+++ b/config/cmake/hdf5-config.cmake.build.in
@@ -1,42 +1,50 @@
 #-----------------------------------------------------------------------------
 # HDF5 Config file for compiling against hdf5 build directory
 #-----------------------------------------------------------------------------
-
-SET (HDF5_INCLUDE_DIRS "@HDF5_INCLUDES_BUILD_TIME@")
+GET_FILENAME_COMPONENT (SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 
 #-----------------------------------------------------------------------------
-# Don't include targets if this file is being picked up by another
-# project which has already build hdf5 as a subproject
+# User Options
 #-----------------------------------------------------------------------------
-IF (NOT TARGET "hdf5" AND NOT HDF5_INSTALL_SKIP_TARGETS)
-  GET_FILENAME_COMPONENT (SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-  INCLUDE (${SELF_DIR}/HDF5-targets.cmake)
-ENDIF (NOT TARGET "hdf5" AND NOT HDF5_INSTALL_SKIP_TARGETS)
-
-SET (HDF5_VERSION_STRING @HDF5_VERSION_STRING@)
-SET (HDF5_VERSION_MAJOR  @HDF5_VERSION_MAJOR@)
-SET (HDF5_VERSION_MINOR  @HDF5_VERSION_MINOR@)
-
 SET (HDF5_ENABLE_PARALLEL @HDF5_ENABLE_PARALLEL@)
 SET (HDF5_BUILD_FORTRAN   @HDF5_BUILD_FORTRAN@)
 SET (HDF5_BUILD_CPP_LIB   @HDF5_BUILD_CPP_LIB@)
 SET (HDF5_BUILD_TOOLS     @HDF5_BUILD_TOOLS@)
 SET (HDF5_BUILD_HL_LIB    @HDF5_BUILD_HL_LIB@)
 
-#
-# To be continued ...
-#
-# XXX_INCLUDE_DIRS         The final set of include directories listed in one variable for use by client code.  This should not be a cache entry.
-# XXX_LIBRARIES          	 The libraries to link against to use XXX. These should include full paths.  This should not be a cache entry.
-# XXX_DEFINITIONS        	 Definitions to use when compiling code that uses XXX. This really shouldn't include options such as (-DHAS_JPEG)that a client source-code file uses to decide whether to #include <jpeg.h>
-# XXX_EXECUTABLE         	 Where to find the XXX tool.
-# XXX_YYY_EXECUTABLE     	 Where to find the YYY tool that comes with XXX.
-# XXX_LIBRARY_DIRS         Optionally, the final set of library directories listed in one variable for use by client code.  This should not be a cache entry.
-# XXX_ROOT_DIR           	 Where to find the base directory of XXX.
-# XXX_VERSION_YY		       Expect Version YY if true. Make sure at most one of these is ever true.
-# XXX_WRAP_YY		           If False, do not try to use the relevent CMake wrapping command.
-# XXX_YY_FOUND           	 If False, optional YY part of XXX sytem is not available.
-# XXX_FOUND              	 Set to false, or undefined, if we haven't found, or don't want to use XXX.
-# XXX_RUNTIME_LIBRARY_DIRS Optionally, the runtime library search path for use when running an executable linked to shared libraries.
-#                          The list should be used by user code to create the PATH on windows or LD_LIBRARY_PATH on unix.
-#                          This should not be a cache entry.
+#-----------------------------------------------------------------------------
+# Directories
+#-----------------------------------------------------------------------------
+SET (HDF5_INCLUDE_DIR "@HDF5_INCLUDES_BUILD_TIME@")
+
+IF (HDF5_BUILD_FORTRAN)
+  SET (HDF5_INCLUDE_DIR_FORTRAN "@CMAKE_Fortran_MODULE_DIRECTORY@" )
+ENDIF (HDF5_BUILD_FORTRAN)
+  
+IF (HDF5_BUILD_CPP_LIB)
+  SET (HDF5_INCLUDE_DIR_CPP ${HDF5_INCLUDE_DIR} )
+ENDIF (HDF5_BUILD_CPP_LIB)
+
+IF (HDF5_BUILD_HL_LIB)
+  SET (HDF5_INCLUDE_DIR_HL ${HDF5_INCLUDE_DIR} )
+ENDIF (HDF5_BUILD_HL_LIB)
+
+IF (HDF5_BUILD_TOOLS)
+  SET (HDF5_INCLUDE_DIR_CPP ${HDF5_INCLUDE_DIR} )
+ENDIF (HDF5_BUILD_TOOLS)
+
+#-----------------------------------------------------------------------------
+# Version Strings
+#-----------------------------------------------------------------------------
+SET (HDF5_VERSION_STRING @HDF5_VERSION_STRING@)
+SET (HDF5_VERSION_MAJOR  @HDF5_VERSION_MAJOR@)
+SET (HDF5_VERSION_MINOR  @HDF5_VERSION_MINOR@)
+
+#-----------------------------------------------------------------------------
+# Don't include targets if this file is being picked up by another
+# project which has already build hdf5 as a subproject
+#-----------------------------------------------------------------------------
+IF (NOT TARGET "hdf5")
+  GET_FILENAME_COMPONENT (SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+  INCLUDE (${SELF_DIR}/hdf5-targets.cmake)
+ENDIF (NOT TARGET "hdf5")