[svn-r19106] Move Resources folder to config/cmake

Tested: Local Linux

23 files changed, 66 insertions, 52 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f9b264..d74808b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,7 +67,7 @@ PROJECT (HDF5 C CXX)
 #   
 #   # Add the sub project
 #   ADD_SUBDIRECTORY(Utilities/hdf5-1.8)
-#   # Add the HDf5 dirs to our include path
+#   # Add the HDF5 dirs to our include path
 #   SET(HDF5_INCLUDE_DIR 
 #     ${ParaView_SOURCE_DIR}/Utilities/hdf5-1.8/src
 #     ${ParaView_BINARY_DIR}/Utilities/hdf5-1.8
@@ -85,7 +85,7 @@ SET (HDF5_PACKAGE_VERSION_MAJOR "${H5_VERS_MAJOR}.${H5_VERS_MINOR}")
 SET (HDF5_PACKAGE_VERSION_MINOR "${H5_VERS_RELEASE}")
 SET (HDF5_PACKAGE_STRING "${HDF5_PACKAGE_NAME} ${HDF5_PACKAGE_VERSION}-${H5_VERS_SUBRELEASE}")
 SET (HDF5_PACKAGE_TARNAME "hdf5")
-SET (HDF5_PACKAGE_URL "htt://www.hdfgroup.org")
+SET (HDF5_PACKAGE_URL "http://www.hdfgroup.org")
 SET (HDF5_PACKAGE_BUGREPORT "help@hdfgroup.org")
 
 #-----------------------------------------------------------------------------
@@ -123,7 +123,7 @@ SET (HDF5_HL_F90_C_LIB_NAME     "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_HL_F90_C_LIB_
 #-----------------------------------------------------------------------------
 # Define some CMake variables for use later in the project
 #-----------------------------------------------------------------------------
-SET (HDF5_RESOURCES_DIR      ${HDF5_SOURCE_DIR}/Resources)
+SET (HDF5_RESOURCES_DIR      ${HDF5_SOURCE_DIR}/config/cmake)
 SET (HDF5_SRC_DIR            ${HDF5_SOURCE_DIR}/src)
 SET (HDF5_TEST_SOURCE_DIR    ${HDF5_SOURCE_DIR}/test)
 SET (HDF5_CPP_SOURCE_DIR     ${HDF5_SOURCE_DIR}/c++)
@@ -175,12 +175,12 @@ ENDIF (NOT HDF5_EXPORTED_TARGETS)
 # add it to this variable. This is NOT used by Make Install, but for projects
 # which include hdf5 as a sub-project within their build tree
 #-----------------------------------------------------------------------------
-SET_GLOBAL_VARIABLE(HDF5_LIBRARIES_TO_EXPORT "")
+SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "")
 
 #-----------------------------------------------------------------------------
 # Run all the CMake configuration tests for our build environment
 #-----------------------------------------------------------------------------
-INCLUDE (${HDF5_SOURCE_DIR}/ConfigureChecks.cmake)
+INCLUDE (${HDF5_RESOURCES_DIR}/ConfigureChecks.cmake)
 
 #-----------------------------------------------------------------------------
 # Option to use legacy naming for windows libs/programs, default is legacy
@@ -212,7 +212,7 @@ IF (BUILD_SHARED_LIBS)
 ELSE (BUILD_SHARED_LIBS)
   IF (NOT WIN32)
     # should this be a user setting : Everyone uses it anyway ?
-    ADD_DEFINITIONS(-DPIC)
+    ADD_DEFINITIONS (-DPIC)
   ENDIF (NOT WIN32)
   IF (MSVC)
     SET (CMAKE_MFC_FLAG 0)
@@ -316,9 +316,9 @@ IF (HDF5_DISABLE_COMPILER_WARNINGS)
         CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
     SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /w")
   ENDIF (MSVC)
-  IF(WIN32)
+  IF (WIN32)
     ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS)
-  ENDIF(WIN32)
+  ENDIF (WIN32)
   # Borland uses -w- to suppress warnings.
   IF (BORLAND)
     SET (HDF5_WARNINGS_BLOCKED 1)
@@ -438,7 +438,7 @@ IF (HDF5_ENABLE_Z_LIB_SUPPORT)
     SET (H5_HAVE_ZLIB_H 1)
     SET (H5_HAVE_LIBZ 1)
   ENDIF (NOT H5_ZLIB_HEADER)
-  CONFIGURE_FILE (${HDF5_SOURCE_DIR}/Resources/hdf5_zlib.h.in ${HDF5_BINARY_DIR}/hdf5_zlib.h @ONLY)
+  CONFIGURE_FILE (${HDF5_RESOURCES_DIR}/hdf5_zlib.h.in ${HDF5_BINARY_DIR}/hdf5_zlib.h @ONLY)
   SET (LINK_LIBS ${LINK_LIBS} ${ZLIB_LIBRARIES})
   INCLUDE_DIRECTORIES (${ZLIB_INCLUDE_DIRS})
   MESSAGE (STATUS "Filter ZLIB is ON")
@@ -447,7 +447,7 @@ ENDIF (HDF5_ENABLE_Z_LIB_SUPPORT)
 #-----------------------------------------------------------------------------
 # Option for SzLib support
 #-----------------------------------------------------------------------------
-SET (CMAKE_MODULE_PATH ${HDF5_SOURCE_DIR}/Resources/CMake ${CMAKE_MODULE_PATH})
+SET (CMAKE_MODULE_PATH ${HDF5_RESOURCES_DIR} ${CMAKE_MODULE_PATH})
 OPTION (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF)
 IF (HDF5_ENABLE_SZIP_SUPPORT)
   FIND_PACKAGE (SZIP REQUIRED)
@@ -488,7 +488,7 @@ ADD_SUBDIRECTORY (${HDF5_SOURCE_DIR}/src ${PROJECT_BINARY_DIR}/src)
 #-----------------------------------------------------------------------------
 IF (HDF5_BUILD_TOOLS AND BUILD_TESTING)
   SET (XLATE_UTILITY "xlatefile")
-  ADD_EXECUTABLE(${XLATE_UTILITY} ${HDF5_SOURCE_DIR}/Resources/xlatefile.c)
+  ADD_EXECUTABLE(${XLATE_UTILITY} ${HDF5_RESOURCES_DIR}/xlatefile.c)
 ENDIF (HDF5_BUILD_TOOLS AND BUILD_TESTING)
 
 #-----------------------------------------------------------------------------
@@ -496,8 +496,10 @@ ENDIF (HDF5_BUILD_TOOLS AND BUILD_TESTING)
 #-----------------------------------------------------------------------------
 OPTION (BUILD_TESTING "Build HDF5 Unit Testing" OFF)
 IF (BUILD_TESTING)
-  SET (DART_TESTING_TIMEOUT 1200 CACHE INTEGER
-       "Timeout in seconds for each test (default 1200=20minutes)")
+  SET (DART_TESTING_TIMEOUT 1200
+      CACHE INTEGER
+      "Timeout in seconds for each test (default 1200=20minutes)"
+  )
   ENABLE_TESTING ()
   INCLUDE (CTest)
   IF (NOT HDF5_EXTERNALLY_CONFIGURED)
@@ -560,7 +562,7 @@ ENDIF (HDF5_BUILD_HL_LIB)
 #-----------------------------------------------------------------------------
 # Generate the H5pubconf.h file containing user settings needed by compilation
 #-----------------------------------------------------------------------------
-CONFIGURE_FILE (${HDF5_SOURCE_DIR}/Resources/H5pubconf.h.in ${HDF5_BINARY_DIR}/H5pubconf.h @ONLY)
+CONFIGURE_FILE (${HDF5_RESOURCES_DIR}/H5pubconf.h.in ${HDF5_BINARY_DIR}/H5pubconf.h @ONLY)
 
 #-----------------------------------------------------------------------------
 # Add file(s) to CMake Install
@@ -608,7 +610,7 @@ SET (HDF5_VERSION_MAJOR  @HDF5_PACKAGE_VERSION_MAJOR@)
 SET (HDF5_VERSION_MINOR  @HDF5_PACKAGE_VERSION_MINOR@)
 
 CONFIGURE_FILE (
-    ${HDF5_SOURCE_DIR}/Resources/HDF5-config.cmake.build.in 
+    ${HDF5_RESOURCES_DIR}/HDF5-config.cmake.build.in 
     ${HDF5_BINARY_DIR}/HDF5-config.cmake @ONLY
 )
 
@@ -619,7 +621,7 @@ INSTALL (CODE
     "SET (HDF5_INSTALL_SKIP_TARGETS 1)
      INCLUDE (${HDF5_BINARY_DIR}/HDF5-config.cmake) 
      CONFIGURE_FILE (
-         \"${HDF5_SOURCE_DIR}/Resources/HDF5-config.cmake.install.in\" 
+         \"${HDF5_RESOURCES_DIR}/HDF5-config.cmake.install.in\" 
          \"${CMAKE_INSTALL_PREFIX}/lib/HDF5-config.cmake\" @ONLY
      )
     "
diff --git a/MANIFEST b/MANIFEST
index e697b5e..0889303 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1852,23 +1852,23 @@
 ./vms/tools/testfiles/tperror.ddl
 
 # CMake-specific Files
-./Resources/CMake/FindSZIP.cmake
-./Resources/ConversionTests.c
-./Resources/GetTimeOfDayTest.cpp
-./Resources/HDF5Tests.c
-./Resources/xlatefile.c
-./Resources/CheckTypeSize.cmake
-./Resources/H5cxx_config.h.in
-./Resources/H5pubconf.h.in
-./Resources/hdf5_zlib.h.in
-./Resources/FindHDF5.cmake
-./Resources/HDF5-config.cmake.build.in
-./Resources/HDF5-config.cmake.install.in
-./Resources/HDF5Macros.cmake
-./Resources/libhdf5.settings.cmake.in
-./Resources/cacheinit.cmake
-./Resources/runTest.cmake
-./Resources/CTestCustom.ctest
+./config/cmake/FindSZIP.cmake
+./config/cmake/ConversionTests.c
+./config/cmake/GetTimeOfDayTest.cpp
+./config/cmake/HDF5Tests.c
+./config/cmake/xlatefile.c
+./config/cmake/CheckTypeSize.cmake
+./config/cmake/H5cxx_config.h.in
+./config/cmake/H5pubconf.h.in
+./config/cmake/hdf5_zlib.h.in
+./config/cmake/FindHDF5.cmake
+./config/cmake/HDF5-config.cmake.build.in
+./config/cmake/HDF5-config.cmake.install.in
+./config/cmake/HDF5Macros.cmake
+./config/cmake/libhdf5.settings.cmake.in
+./config/cmake/cacheinit.cmake
+./config/cmake/runTest.cmake
+./config/cmake/CTestCustom.ctest
 ./CMakeLists.txt
 ./ConfigureChecks.cmake
 ./CTestConfig.cmake
diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt
index b1edc06..7571e54 100644
--- a/c++/CMakeLists.txt
+++ b/c++/CMakeLists.txt
@@ -11,7 +11,7 @@ ENDIF (BUILD_SHARED_LIBS)
 #-----------------------------------------------------------------------------
 # Generate configure file
 #-----------------------------------------------------------------------------
-CONFIGURE_FILE (${HDF5_SOURCE_DIR}/Resources/H5cxx_config.h.in
+CONFIGURE_FILE (${HDF5_RESOURCES_DIR}/H5cxx_config.h.in
                 ${HDF5_BINARY_DIR}/H5cxx_pubconf.h
 )
 
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
index 2cf3d7b..fee9a6a 100644
--- a/c++/src/CMakeLists.txt
+++ b/c++/src/CMakeLists.txt
@@ -11,7 +11,7 @@ ENDIF (BUILD_SHARED_LIBS)
 #-----------------------------------------------------------------------------
 # Generate configure file
 #-----------------------------------------------------------------------------
-CONFIGURE_FILE (${HDF5_SOURCE_DIR}/Resources/H5cxx_config.h.in
+CONFIGURE_FILE (${HDF5_RESOURCES_DIR}/H5cxx_config.h.in
                 ${HDF5_BINARY_DIR}/H5cxx_pubconf.h
 )
 
diff --git a/Resources/CTestCustom.ctest b/config/cmake/CTestCustom.ctest
index 23b4163..23b4163 100755
--- a/Resources/CTestCustom.ctest
+++ b/config/cmake/CTestCustom.ctest
diff --git a/Resources/CheckTypeSize.cmake b/config/cmake/CheckTypeSize.cmake
index 2e83080..eca6e76 100644
--- a/Resources/CheckTypeSize.cmake
+++ b/config/cmake/CheckTypeSize.cmake
@@ -27,7 +27,7 @@ MACRO (HDF_CHECK_TYPE_SIZE TYPE VARIABLE)
     ENDIF (CMAKE_REQUIRED_LIBRARIES)
     TRY_RUN (${VARIABLE} HAVE_${VARIABLE}
         ${CMAKE_BINARY_DIR}
-        ${HDF5_PROJECT_DIR}/Resources/CheckTypeSize.c
+        ${HDF5_RESOURCES_DIR}/CheckTypeSize.c
         CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_TYPE_SIZE_FLAGS}
         "${CHECK_TYPE_SIZE_ADD_LIBRARIES}"
         OUTPUT_VARIABLE OUTPUT
diff --git a/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index f2cd86d..ae30d67 100644
--- a/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -379,7 +379,7 @@ IF (NOT MSVC)
   IF ("H5_HAVE_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_TIME_GETTIMEOFDAY$")
     TRY_COMPILE (HAVE_TIME_GETTIMEOFDAY
         ${CMAKE_BINARY_DIR}
-        ${HDF5_SOURCE_DIR}/Resources/GetTimeOfDayTest.cpp
+        ${HDF5_RESOURCES_DIR}/GetTimeOfDayTest.cpp
         COMPILE_DEFINITIONS -DTRY_TIME_H
         OUTPUT_VARIABLE OUTPUT
     )
@@ -391,7 +391,7 @@ IF (NOT MSVC)
   IF ("H5_HAVE_SYS_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_SYS_TIME_GETTIMEOFDAY$")
     TRY_COMPILE (HAVE_SYS_TIME_GETTIMEOFDAY
         ${CMAKE_BINARY_DIR}
-        ${HDF5_SOURCE_DIR}/Resources/GetTimeOfDayTest.cpp
+        ${HDF5_RESOURCES_DIR}/GetTimeOfDayTest.cpp
         COMPILE_DEFINITIONS -DTRY_SYS_TIME_H
         OUTPUT_VARIABLE OUTPUT
     )
@@ -466,7 +466,7 @@ MACRO (HDF5_FUNCTION_TEST OTHER_TEST)
     # (STATUS "Performing ${OTHER_TEST}")
     TRY_COMPILE (${OTHER_TEST}
         ${CMAKE_BINARY_DIR}
-        ${HDF5_SOURCE_DIR}/Resources/HDF5Tests.c
+        ${HDF5_RESOURCES_DIR}/HDF5Tests.c
         CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
         "${OTHER_TEST_ADD_LIBRARIES}"
         OUTPUT_VARIABLE OUTPUT
@@ -562,7 +562,7 @@ IF (H5_PRINTF_LL_WIDTH MATCHES "^H5_PRINTF_LL_WIDTH$")
     ENDIF (H5_SIZEOF_LONG_LONG)
     TRY_RUN (HDF5_PRINTF_LL_TEST_RUN   HDF5_PRINTF_LL_TEST_COMPILE
         ${HDF5_BINARY_DIR}/CMake
-        ${HDF5_SOURCE_DIR}/Resources/HDF5Tests.c
+        ${HDF5_RESOURCES_DIR}/HDF5Tests.c
         CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CURRENT_TEST_DEFINITIONS}
         OUTPUT_VARIABLE OUTPUT
     )
@@ -616,7 +616,7 @@ MACRO (H5ConversionTests TEST msg)
    # MESSAGE (STATUS "===> ${TEST}")
     TRY_RUN (${TEST}_RUN   ${TEST}_COMPILE
         ${HDF5_BINARY_DIR}/CMake
-        ${HDF5_SOURCE_DIR}/Resources/ConversionTests.c
+        ${HDF5_RESOURCES_DIR}/ConversionTests.c
         CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=-D${TEST}_TEST
         OUTPUT_VARIABLE OUTPUT
     )
diff --git a/Resources/ConversionTests.c b/config/cmake/ConversionTests.c
index 0e24954..0e24954 100644
--- a/Resources/ConversionTests.c
+++ b/config/cmake/ConversionTests.c
diff --git a/Resources/FindHDF5.cmake b/config/cmake/FindHDF5.cmake
index 4e448ca..4e448ca 100644
--- a/Resources/FindHDF5.cmake
+++ b/config/cmake/FindHDF5.cmake
diff --git a/Resources/CMake/FindSZIP.cmake b/config/cmake/FindSZIP.cmake
index 190b0b5..6118f7a 100644
--- a/Resources/CMake/FindSZIP.cmake
+++ b/config/cmake/FindSZIP.cmake
@@ -8,10 +8,10 @@
 #  SZIP_FOUND, If false, do not try to use SZIP.
 #    also defined, but not for general use are
 #  SZIP_LIBRARY, where to find the SZIP library.
-#  SZIP_LIBRARY_DEBUG - Debug version of tiff library
-#  SZIP_LIBRARY_RELEASE - Release Version of tiff library
+#  SZIP_LIBRARY_DEBUG - Debug version of SZIP library
+#  SZIP_LIBRARY_RELEASE - Release Version of SZIP library
 
-# MESSAGE (STATUS "Finding Szip library and headers..." )
+# MESSAGE (STATUS "Finding SZIP library and headers..." )
 
 ############################################
 #
diff --git a/Resources/GetTimeOfDayTest.cpp b/config/cmake/GetTimeOfDayTest.cpp
index 3b5bf60..3b5bf60 100644
--- a/Resources/GetTimeOfDayTest.cpp
+++ b/config/cmake/GetTimeOfDayTest.cpp
diff --git a/Resources/H5cxx_config.h.in b/config/cmake/H5cxx_config.h.in
index c4e1c03..c4e1c03 100644
--- a/Resources/H5cxx_config.h.in
+++ b/config/cmake/H5cxx_config.h.in
diff --git a/Resources/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 3f4bdc5..d4616a3 100644
--- a/Resources/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -317,6 +317,9 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #cmakedefine H5_HAVE_STDINT_H @H5_HAVE_STDINT_H@
 
+/* Define to 1 if you have the <stdint.h> header file for Cplusplus. */
+#cmakedefine H5_HAVE_STDINT_H_CXX @H5_HAVE_STDINT_H_CXX@
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #cmakedefine H5_HAVE_STDLIB_H @H5_HAVE_STDLIB_H@
 
diff --git a/Resources/HDF5-config.cmake.build.in b/config/cmake/HDF5-config.cmake.build.in
index 132e8be..132e8be 100644
--- a/Resources/HDF5-config.cmake.build.in
+++ b/config/cmake/HDF5-config.cmake.build.in
diff --git a/Resources/HDF5-config.cmake.install.in b/config/cmake/HDF5-config.cmake.install.in
index 2c33edf..2c33edf 100644
--- a/Resources/HDF5-config.cmake.install.in
+++ b/config/cmake/HDF5-config.cmake.install.in
diff --git a/Resources/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake
index 8b30fbf..8b30fbf 100644
--- a/Resources/HDF5Macros.cmake
+++ b/config/cmake/HDF5Macros.cmake
diff --git a/Resources/HDF5Tests.c b/config/cmake/HDF5Tests.c
index 35e7258..35e7258 100644
--- a/Resources/HDF5Tests.c
+++ b/config/cmake/HDF5Tests.c
diff --git a/Resources/cacheinit.cmake b/config/cmake/cacheinit.cmake
index 23e6aed..23e6aed 100755
--- a/Resources/cacheinit.cmake
+++ b/config/cmake/cacheinit.cmake
diff --git a/Resources/hdf5_zlib.h.in b/config/cmake/hdf5_zlib.h.in
index 104db27..104db27 100644
--- a/Resources/hdf5_zlib.h.in
+++ b/config/cmake/hdf5_zlib.h.in
diff --git a/Resources/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
index a3032e5..a3032e5 100644
--- a/Resources/libhdf5.settings.cmake.in
+++ b/config/cmake/libhdf5.settings.cmake.in
diff --git a/Resources/runTest.cmake b/config/cmake/runTest.cmake
index 4218671..227ef9b 100644
--- a/Resources/runTest.cmake
+++ b/config/cmake/runTest.cmake
@@ -17,6 +17,9 @@ ENDIF (NOT TEST_OUTPUT)
 #IF (NOT TEST_EXPECT)
 #  MESSAGE (STATUS "Require TEST_EXPECT to be defined")
 #ENDIF (NOT TEST_EXPECT)
+#IF (NOT TEST_FILTER)
+#  MESSAGE (STATUS "Require TEST_FILTER to be defined")
+#ENDIF (NOT TEST_FILTER)
 IF (NOT TEST_REFERENCE)
   MESSAGE (FATAL_ERROR "Require TEST_REFERENCE to be defined")
 ENDIF (NOT TEST_REFERENCE)
@@ -61,6 +64,12 @@ IF (TEST_MASK)
   FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
 ENDIF (TEST_MASK)
 
+IF (TEST_FILTER)
+  FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
+  STRING(REGEX REPLACE "${TEST_FILTER}" "" TEST_STREAM "${TEST_STREAM}") 
+  FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
+ENDIF (TEST_FILTER)
+
 IF (WIN32 AND NOT MINGW)
   FILE (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
   FILE (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
diff --git a/Resources/xlatefile.c b/config/cmake/xlatefile.c
index c16f573..c16f573 100644
--- a/Resources/xlatefile.c
+++ b/config/cmake/xlatefile.c
diff --git a/fortran/CMakeLists.txt b/fortran/CMakeLists.txt
index 9fc9ba0..02cd07f 100644
--- a/fortran/CMakeLists.txt
+++ b/fortran/CMakeLists.txt
@@ -110,19 +110,19 @@ CHECK_FORTRAN_FEATURE(RealIsNotDouble
 #-----------------------------------------------------------------------------
 # Make sure generated files and modules are picked up correctly
 #-----------------------------------------------------------------------------
-INCLUDE_DIRECTORIES( 
-  ${CMAKE_Fortran_MODULE_DIRECTORY}
-  ${HDF5_F90_BINARY_DIR}
- )
+INCLUDE_DIRECTORIES ( 
+    ${CMAKE_Fortran_MODULE_DIRECTORY}
+    ${HDF5_F90_BINARY_DIR}
+)
 
 #-----------------------------------------------------------------------------
 # Add debug information (intel Fortran : JB)
 #-----------------------------------------------------------------------------
 IF (CMAKE_Fortran_COMPILER MATCHES ifort)
-    IF (WIN32)
-        SET (CMAKE_Fortran_FLAGS_DEBUG "/debug:full /dbglibs " CACHE "flags" STRING FORCE)
-        SET (CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG" CACHE "flags" STRING FORCE)
-    ENDIF (WIN32)
+  IF (WIN32)
+    SET (CMAKE_Fortran_FLAGS_DEBUG "/debug:full /dbglibs " CACHE "flags" STRING FORCE)
+    SET (CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG" CACHE "flags" STRING FORCE)
+  ENDIF (WIN32)
 ENDIF (CMAKE_Fortran_COMPILER MATCHES ifort)
 
 #-----------------------------------------------------------------------------