[svn-r24781] HDFFV-8700 -

KitWare recommendations: Change CMake commands to lower case.
Remove INCLUDE_DIRECTORIES in src for target level includes.
Change ADD_DEFINITIONS package debug defines into CMake option.
Remove -DNDEBUG

1 files changed, 43 insertions, 43 deletions

diff --git a/config/cmake/hdf5-config.cmake.install.in b/config/cmake/hdf5-config.cmake.install.in
index 9c5a5a1..799ff9d 100644
--- a/config/cmake/hdf5-config.cmake.install.in
+++ b/config/cmake/hdf5-config.cmake.install.in
@@ -4,24 +4,24 @@
 GET_FILENAME_COMPONENT (SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)

 GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${SELF_DIR}" PATH)

 GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)

-IF (NOT WIN32)

+if (NOT WIN32)

   GET_FILENAME_COMPONENT(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)

-ENDIF (NOT WIN32)

+endif (NOT WIN32)

 

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

 # User Options

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

-SET (HDF5_ENABLE_PARALLEL @HDF5_ENABLE_PARALLEL@)

-SET (HDF5_BUILD_FORTRAN   @HDF5_BUILD_FORTRAN@)

-SET (HDF5_ENABLE_F2003    @HDF5_ENABLE_F2003@)

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

-SET (HDF5_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@)

-SET (HDF5_ENABLE_SZIP_SUPPORT  @HDF5_ENABLE_SZIP_SUPPORT@)

-SET (HDF5_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@)

-SET (HDF5_BUILD_SHARED_LIBS    @BUILD_SHARED_LIBS@)

-SET (HDF5_PACKAGE_EXTLIBS      @HDF5_PACKAGE_EXTLIBS@)

+set (HDF5_ENABLE_PARALLEL @HDF5_ENABLE_PARALLEL@)

+set (HDF5_BUILD_FORTRAN   @HDF5_BUILD_FORTRAN@)

+set (HDF5_ENABLE_F2003    @HDF5_ENABLE_F2003@)

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

+set (HDF5_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@)

+set (HDF5_ENABLE_SZIP_SUPPORT  @HDF5_ENABLE_SZIP_SUPPORT@)

+set (HDF5_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@)

+set (HDF5_BUILD_SHARED_LIBS    @BUILD_SHARED_LIBS@)

+set (HDF5_PACKAGE_EXTLIBS      @HDF5_PACKAGE_EXTLIBS@)

 

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

 # Dependencies

@@ -34,48 +34,48 @@ ENDIF(HDF5_ENABLE_PARALLEL)
 #-----------------------------------------------------------------------------

 # Directories

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

-SET (HDF5_INCLUDE_DIR "${_IMPORT_PREFIX}/include" "${HDF5_MPI_C_INCLUDE_PATH}" )

+set (HDF5_INCLUDE_DIR "${_IMPORT_PREFIX}/include" "${HDF5_MPI_C_INCLUDE_PATH}" )

 

-IF (HDF5_BUILD_FORTRAN)

-  SET (HDF5_INCLUDE_DIR_FORTRAN "${_IMPORT_PREFIX}/include/fortran" )

-ENDIF (HDF5_BUILD_FORTRAN)

+if (HDF5_BUILD_FORTRAN)

+  set (HDF5_INCLUDE_DIR_FORTRAN "${_IMPORT_PREFIX}/include/fortran" )

+endif (HDF5_BUILD_FORTRAN)

   

-IF (HDF5_BUILD_CPP_LIB)

-  SET (HDF5_INCLUDE_DIR_CPP "${_IMPORT_PREFIX}/include/cpp" )

-ENDIF (HDF5_BUILD_CPP_LIB)

+if (HDF5_BUILD_CPP_LIB)

+  set (HDF5_INCLUDE_DIR_CPP "${_IMPORT_PREFIX}/include/cpp" )

+endif (HDF5_BUILD_CPP_LIB)

 

-IF (HDF5_BUILD_HL_LIB)

-  SET (HDF5_INCLUDE_DIR_HL "${_IMPORT_PREFIX}/include/hl" )

-ENDIF (HDF5_BUILD_HL_LIB)

+if (HDF5_BUILD_HL_LIB)

+  set (HDF5_INCLUDE_DIR_HL "${_IMPORT_PREFIX}/include/hl" )

+endif (HDF5_BUILD_HL_LIB)

 

-IF (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)

-  SET (HDF5_INCLUDE_DIR_HL_CPP "${_IMPORT_PREFIX}/include/hl/cpp" )

-ENDIF (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)

+if (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)

+  set (HDF5_INCLUDE_DIR_HL_CPP "${_IMPORT_PREFIX}/include/hl/cpp" )

+endif (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)

 

-IF (HDF5_BUILD_TOOLS)

-  SET (HDF5_INCLUDE_DIR_TOOLS "${_IMPORT_PREFIX}/include" )

-  SET (HDF5_TOOLS_DIR "${_IMPORT_PREFIX}/bin" )

-ENDIF (HDF5_BUILD_TOOLS)

+if (HDF5_BUILD_TOOLS)

+  set (HDF5_INCLUDE_DIR_TOOLS "${_IMPORT_PREFIX}/include" )

+  set (HDF5_TOOLS_DIR "${_IMPORT_PREFIX}/bin" )

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

+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_PACKAGE@")

-  IF (HDF5_ENABLE_Z_LIB_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "zlib")

-    INCLUDE (${SELF_DIR}/../ZLIB/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)

-  ENDIF (HDF5_ENABLE_Z_LIB_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "zlib")

-  IF (HDF5_ENABLE_SZIP_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "szip")

-    INCLUDE (${SELF_DIR}/../SZIP/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)

-  ENDIF (HDF5_ENABLE_SZIP_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "szip")

-  INCLUDE (${SELF_DIR}/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)

-  SET (HDF5_LIBRARIES "@HDF5_LIBRARIES_TO_EXPORT@")

-ENDIF (NOT TARGET "@HDF5_PACKAGE@")

+if (NOT TARGET "@HDF5_PACKAGE@")

+  if (HDF5_ENABLE_Z_LIB_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "zlib")

+    include (${SELF_DIR}/../ZLIB/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)

+  endif (HDF5_ENABLE_Z_LIB_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "zlib")

+  if (HDF5_ENABLE_SZIP_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "szip")

+    include (${SELF_DIR}/../SZIP/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)

+  endif (HDF5_ENABLE_SZIP_SUPPORT AND HDF5_PACKAGE_EXTLIBS AND NOT TARGET "szip")

+  include (${SELF_DIR}/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)

+  set (HDF5_LIBRARIES "@HDF5_LIBRARIES_TO_EXPORT@")

+endif (NOT TARGET "@HDF5_PACKAGE@")