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

Tested: Local Linux

CMakeLists.txt

@@ -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}")
 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++)
@@ -180,7 +180,7 @@ 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
@@ -436,7 +436,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")
@@ -445,7 +445,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)
@@ -486,7 +486,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)
 
 #-----------------------------------------------------------------------------
@@ -558,7 +558,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
@@ -606,7 +606,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
 )
 
@@ -617,7 +617,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
      )
     "

MANIFEST

@@ -1880,23 +1880,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

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
 )
 

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
 )
 

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

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
     )

release_docs/CMake.txt

@@ -96,7 +96,7 @@ Notes: This short instruction is written for users who want to quickly build
             step on Windows.                                                                                      
               
    5. The files that support building HDF5 with CMake are all the files in the 
-      Resources folder, the CMakeLists.txt files in each source folder, and two 
+      config/cmake folder, the CMakeLists.txt files in each source folder, and two 
       additional files, ConfigureChecks.cmake and CTestConfig.cmake. The 
       CTestConfig.cmake is specific to the internal testing performed by The HDF 
       Group. It should be altered for the users installation and needs.