[svn-r22719] Fix RelWithDebInfo packaging

Tested: windows

12 files changed, 26 insertions, 26 deletions

diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake
index 5e0fcdc..499c227 100644
--- a/config/cmake/HDFMacros.cmake
+++ b/config/cmake/HDFMacros.cmake
@@ -34,23 +34,23 @@ MACRO (IDE_SOURCE_PROPERTIES SOURCE_PATH HEADERS SOURCES)
 ENDMACRO (IDE_SOURCE_PROPERTIES)
 
 #-------------------------------------------------------------------------------
-MACRO (TARGET_NAMING target libtype)
+MACRO (TARGET_NAMING libtarget libtype)
   IF (WIN32)
     IF (${libtype} MATCHES "SHARED")
       IF (HDF_LEGACY_NAMING)
-        SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "dll")
-        SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX "${target}")
+        SET_TARGET_PROPERTIES (${libtarget} PROPERTIES OUTPUT_NAME "dll")
+        SET_TARGET_PROPERTIES (${libtarget} PROPERTIES PREFIX "${libtarget}")
       ELSE (HDF_LEGACY_NAMING)
-        SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "${target}dll")
+        SET_TARGET_PROPERTIES (${libtarget} PROPERTIES OUTPUT_NAME "${libtarget}dll")
       ENDIF (HDF_LEGACY_NAMING)
     ENDIF (${libtype} MATCHES "SHARED")
   ENDIF (WIN32)
 ENDMACRO (TARGET_NAMING)
 
 #-------------------------------------------------------------------------------
-MACRO (INSTALL_TARGET_PDB target targetdestination targetcomponent)
+MACRO (INSTALL_TARGET_PDB libtarget targetdestination targetcomponent)
   IF (WIN32 AND MSVC)
-    GET_TARGET_PROPERTY (target_name ${target} RELWITHDEBINFO_OUTPUT_NAME)
+    GET_TARGET_PROPERTY (target_name ${libtarget} RELWITHDEBINFO_OUTPUT_NAME)
     INSTALL (
       FILES
           ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${target_name}.pdb
@@ -63,10 +63,10 @@ MACRO (INSTALL_TARGET_PDB target targetdestination targetcomponent)
 ENDMACRO (INSTALL_TARGET_PDB)
 
 #-------------------------------------------------------------------------------
-MACRO (INSTALL_PROGRAM_PDB target targetdestination targetcomponent)
+MACRO (INSTALL_PROGRAM_PDB progtarget targetdestination targetcomponent)
   IF (WIN32 AND MSVC)
-    GET_TARGET_PROPERTY (target_name ${target} RELWITHDEBINFO_OUTPUT_NAME)
-    GET_TARGET_PROPERTY (target_prefix h5dump PREFIX)
+    GET_TARGET_PROPERTY (target_name ${progtarget} RELWITHDEBINFO_OUTPUT_NAME)
+    GET_TARGET_PROPERTY (target_prefix ${progtarget} PREFIX)
     INSTALL (
       FILES
           ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${target_prefix}${target_name}.pdb
@@ -136,16 +136,16 @@ MACRO (HDF_SET_LIB_OPTIONS libtarget libname libtype)
 ENDMACRO (HDF_SET_LIB_OPTIONS)
 
 #-------------------------------------------------------------------------------
-MACRO (TARGET_FORTRAN_WIN_PROPERTIES target addlinkflags)
+MACRO (TARGET_FORTRAN_WIN_PROPERTIES forttarget addlinkflags)
   IF (WIN32 AND MSVC)
     IF (BUILD_SHARED_LIBS)
-      SET_TARGET_PROPERTIES (${target}
+      SET_TARGET_PROPERTIES (${forttarget}
           PROPERTIES
               COMPILE_FLAGS "/dll"
               LINK_FLAGS "/SUBSYSTEM:CONSOLE ${addlinkflags}"
       ) 
     ELSE (BUILD_SHARED_LIBS)
-      SET_TARGET_PROPERTIES (${target}
+      SET_TARGET_PROPERTIES (${forttarget}
           PROPERTIES
               COMPILE_FLAGS "/MD"
               LINK_FLAGS "/SUBSYSTEM:CONSOLE ${addlinkflags}"
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index c0fea8c..25e14ba 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -272,7 +272,7 @@ ENDIF (WIN32 AND NOT CYGWIN)
 IF (HDF5_EXPORTED_TARGETS)
 
   INSTALL_TARGET_PDB (${HDF5_F90_C_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} fortlibraries)
-  INSTALL_TARGET_PDB (${HDF5_F90_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} fortlibraries)
+  #INSTALL_TARGET_PDB (${HDF5_F90_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} fortlibraries)
 
   INSTALL (
       TARGETS
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index b6f6d08..ec54d8c 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -97,7 +97,7 @@ ENDIF (WIN32 AND NOT CYGWIN)
 IF (HDF5_EXPORTED_TARGETS)
 
   INSTALL_TARGET_PDB (${HDF5_HL_F90_C_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hlfortlibraries)
-  INSTALL_TARGET_PDB (${HDF5_HL_F90_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hlfortlibraries)
+  #INSTALL_TARGET_PDB (${HDF5_HL_F90_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hlfortlibraries)
   
   INSTALL (
       TARGETS
diff --git a/tools/h5copy/CMakeLists.txt b/tools/h5copy/CMakeLists.txt
index 94eb732..95341a2 100644
--- a/tools/h5copy/CMakeLists.txt
+++ b/tools/h5copy/CMakeLists.txt
@@ -375,7 +375,7 @@ ENDIF (BUILD_TESTING)
 # Rules for Installation of tools using make Install target

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

 
-INSTALL_PROGRAM_PDB (h5copy ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+#INSTALL_PROGRAM_PDB (h5copy ${HDF5_INSTALL_BIN_DIR} toolsapplications)
   
 INSTALL (
     TARGETS
diff --git a/tools/h5diff/CMakeLists.txt b/tools/h5diff/CMakeLists.txt
index 903564f..994a6f2 100644
--- a/tools/h5diff/CMakeLists.txt
+++ b/tools/h5diff/CMakeLists.txt
@@ -1436,7 +1436,7 @@ ENDIF (BUILD_TESTING)
 # Rules for Installation of tools using make Install target

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

 
-INSTALL_PROGRAM_PDB (h5diff ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+#INSTALL_PROGRAM_PDB (h5diff ${HDF5_INSTALL_BIN_DIR} toolsapplications)
 
 INSTALL (
     TARGETS
@@ -1449,7 +1449,7 @@ INSTALL (
 
 IF (H5_HAVE_PARALLEL)
 
-  INSTALL_PROGRAM_PDB (ph5diff ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+  #INSTALL_PROGRAM_PDB (ph5diff ${HDF5_INSTALL_BIN_DIR} toolsapplications)
 
   INSTALL (
       TARGETS
diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt
index f98df97..03efa58 100644
--- a/tools/h5dump/CMakeLists.txt
+++ b/tools/h5dump/CMakeLists.txt
@@ -1895,7 +1895,7 @@ ENDIF (BUILD_TESTING)
 # Rules for Installation of tools using make Install target

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

 
-INSTALL_PROGRAM_PDB (h5dump ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+#INSTALL_PROGRAM_PDB (h5dump ${HDF5_INSTALL_BIN_DIR} toolsapplications)
 
 INSTALL (
     TARGETS
diff --git a/tools/h5import/CMakeLists.txt b/tools/h5import/CMakeLists.txt
index 45973f5..b3df94b 100644
--- a/tools/h5import/CMakeLists.txt
+++ b/tools/h5import/CMakeLists.txt
@@ -380,7 +380,7 @@ ENDIF (BUILD_TESTING)
 # Rules for Installation of tools using make Install target

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

 
-INSTALL_PROGRAM_PDB (h5import ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+#INSTALL_PROGRAM_PDB (h5import ${HDF5_INSTALL_BIN_DIR} toolsapplications)
 
 INSTALL (
     TARGETS
diff --git a/tools/h5jam/CMakeLists.txt b/tools/h5jam/CMakeLists.txt
index d0bf30f..b44e734 100644
--- a/tools/h5jam/CMakeLists.txt
+++ b/tools/h5jam/CMakeLists.txt
@@ -535,7 +535,7 @@ ENDIF (BUILD_TESTING)
 # Rules for Installation of tools using make Install target

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

 
-INSTALL_PROGRAM_PDB (h5jam ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+#INSTALL_PROGRAM_PDB (h5jam ${HDF5_INSTALL_BIN_DIR} toolsapplications)
 
 INSTALL (
     TARGETS
diff --git a/tools/h5ls/CMakeLists.txt b/tools/h5ls/CMakeLists.txt
index 81a6787..e2b3285 100644
--- a/tools/h5ls/CMakeLists.txt
+++ b/tools/h5ls/CMakeLists.txt
@@ -434,7 +434,7 @@ ENDIF (BUILD_TESTING)
 # Rules for Installation of tools using make Install target

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

 
-INSTALL_PROGRAM_PDB (h5ls ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+#INSTALL_PROGRAM_PDB (h5ls ${HDF5_INSTALL_BIN_DIR} toolsapplications)
 
 INSTALL (
     TARGETS
diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt
index 936559e..3ee1cba 100644
--- a/tools/h5repack/CMakeLists.txt
+++ b/tools/h5repack/CMakeLists.txt
@@ -899,7 +899,7 @@ ENDIF (BUILD_TESTING)
 # Rules for Installation of tools using make Install target

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

 
-INSTALL_PROGRAM_PDB (h5repack ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+#INSTALL_PROGRAM_PDB (h5repack ${HDF5_INSTALL_BIN_DIR} toolsapplications)
 
 INSTALL (
     TARGETS
diff --git a/tools/h5stat/CMakeLists.txt b/tools/h5stat/CMakeLists.txt
index e8d75e3..3518cfd 100644
--- a/tools/h5stat/CMakeLists.txt
+++ b/tools/h5stat/CMakeLists.txt
@@ -206,7 +206,7 @@ ENDIF (BUILD_TESTING)
 # Rules for Installation of tools using make Install target

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

 
-INSTALL_PROGRAM_PDB (h5stat ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+#INSTALL_PROGRAM_PDB (h5stat ${HDF5_INSTALL_BIN_DIR} toolsapplications)
 
 INSTALL (
     TARGETS
diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt
index 1c6e909..7f61a67 100644
--- a/tools/misc/CMakeLists.txt
+++ b/tools/misc/CMakeLists.txt
@@ -312,9 +312,9 @@ ENDIF (BUILD_TESTING)
 # Rules for Installation of tools using make Install target

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

 
-INSTALL_PROGRAM_PDB (h5debug ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-INSTALL_PROGRAM_PDB (h5repart ${HDF5_INSTALL_BIN_DIR} toolsapplications)
-INSTALL_PROGRAM_PDB (h5mkgrp ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+#INSTALL_PROGRAM_PDB (h5debug ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+#INSTALL_PROGRAM_PDB (h5repart ${HDF5_INSTALL_BIN_DIR} toolsapplications)
+#INSTALL_PROGRAM_PDB (h5mkgrp ${HDF5_INSTALL_BIN_DIR} toolsapplications)
 
 INSTALL (
     TARGETS