[svn-r19260] Change Cmake to allow a local zlib header to be used in H5Zdelate module.

Corrected use of "SKIP" message in cmake.
Corrections to cmake configuration files (for cmake external projects).

Community suggested changes.

Tested: local linux

5 files changed, 112 insertions, 51 deletions

diff --git a/config/cmake/FindSZIP.cmake b/config/cmake/FindSZIP.cmake
index 190b0b5..6118f7a 100644
--- a/config/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/config/cmake/hdf5-config-version.cmake.in b/config/cmake/hdf5-config-version.cmake.in
new file mode 100644
index 0000000..c1201cc
--- /dev/null
+++ b/config/cmake/hdf5-config-version.cmake.in
@@ -0,0 +1,27 @@
+#-----------------------------------------------------------------------------

+# HDF5 Version file for install directory

+#-----------------------------------------------------------------------------

+

+SET (PACKAGE_VERSION @HDF5_VERSION_STRING@)

+

+IF ("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL @H5_VERS_MAJOR@)

+

+  # exact match for version @H5_VERS_MAJOR@.@H5_VERS_MINOR@

+  IF ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL @H5_VERS_MINOR@)

+

+    # compatible with any version @H5_VERS_MAJOR@.@H5_VERS_MINOR@.x

+    SET (PACKAGE_VERSION_COMPATIBLE 1) 

+    

+    IF ("${PACKAGE_FIND_VERSION_PATCH}" EQUAL @H5_VERS_RELEASE@)

+      SET (PACKAGE_VERSION_EXACT 1)    

+

+      IF ("${PACKAGE_FIND_VERSION_TWEAK}" EQUAL @H5_VERS_SUBRELEASE@)

+        # not using this yet

+      ENDIF ("${PACKAGE_FIND_VERSION_TWEAK}" EQUAL @H5_VERS_SUBRELEASE@)

+      

+    ENDIF ("${PACKAGE_FIND_VERSION_PATCH}" EQUAL @H5_VERS_RELEASE@)

+    

+  ENDIF ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL @H5_VERS_MINOR@)

+ENDIF ("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL @H5_VERS_MAJOR@)

+

+

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")

diff --git a/config/cmake/hdf5-config.cmake.install.in b/config/cmake/hdf5-config.cmake.install.in
index 2c33edf..4fda6e8 100644
--- a/config/cmake/hdf5-config.cmake.install.in
+++ b/config/cmake/hdf5-config.cmake.install.in
@@ -1,35 +1,62 @@
 #-----------------------------------------------------------------------------

 # HDF5 Config file for compiling against hdf5 install directory

 #-----------------------------------------------------------------------------

-

 GET_FILENAME_COMPONENT (SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)

-GET_FILENAME_COMPONENT (HDF5_INCLUDE_DIRS "${SELF_DIR}/../include" ABSOLUTE)

-SET (HDF5_FORTRAN_DIR ${HDF5_INCLUDE_DIRS}/fortran)

 

 #-----------------------------------------------------------------------------

-# 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")

-  INCLUDE (${SELF_DIR}/HDF5-targets.cmake)

-ENDIF (NOT TARGET "hdf5")

-

-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@)

 

+#-----------------------------------------------------------------------------

+# Directories

+#-----------------------------------------------------------------------------

+SET (HDF5_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include" )

+

+IF (HDF5_BUILD_FORTRAN)

+  SET (HDF5_INCLUDE_DIR_FORTRAN "@CMAKE_INSTALL_PREFIX@/include/fortran" )

+ENDIF (HDF5_BUILD_FORTRAN)

+  

+IF (HDF5_BUILD_CPP_LIB)

+  SET (HDF5_INCLUDE_DIR_CPP "@CMAKE_INSTALL_PREFIX@/include/cpp" )

+ENDIF (HDF5_BUILD_CPP_LIB)

+

+IF (HDF5_BUILD_HL_LIB)

+  SET (HDF5_INCLUDE_DIR_HL "@CMAKE_INSTALL_PREFIX@/include/hl" )

+ENDIF (HDF5_BUILD_HL_LIB)

+

+IF (HDF5_BUILD_TOOLS)

+  SET (HDF5_INCLUDE_DIR_CPP "@CMAKE_INSTALL_PREFIX@/include/tools" )

+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 built hdf5 as a subproject

+#-----------------------------------------------------------------------------

+IF (NOT TARGET "hdf5")

+  INCLUDE (${SELF_DIR}/hdf5-targets.cmake)

+ENDIF (NOT TARGET "hdf5")

+

+#-----------------------------------------------------------------------------

+# Unfinished

+#-----------------------------------------------------------------------------

 #

-# To be continued ...

+# To be continued (maybe) ...

 #

-# 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_INCLUDE_DIRS         no, use one per library as in HDF5_FORTRAN_INCLUDE_DIR

+# XXX_LIBRARIES          	 not needed - see hdf5-targets.cmake

+# 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.

diff --git a/config/cmake/hdf5_zlib.h.in b/config/cmake/hdf5_zlib.h.in
deleted file mode 100644
index 104db27..0000000
--- a/config/cmake/hdf5_zlib.h.in
+++ /dev/null
@@ -1 +0,0 @@
-#include <@H5_ZLIB_HEADER@>