CMake fix gen. exprs. and add h5copy help (#2918)

2 files changed, 3 insertions, 130 deletions

diff --git a/config/cmake/FindSZIP.cmake b/config/cmake/FindSZIP.cmake
deleted file mode 100644
index b96a732..0000000
--- a/config/cmake/FindSZIP.cmake
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# Copyright by The HDF Group.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://www.hdfgroup.org/licenses.
-# If you do not have access to either file, you may request a copy from
-# help@hdfgroup.org.
-#
-#########################################################################
-
-# - Derived from the FindTiff.cmake and FindJPEG.cmake that is included with cmake
-# FindSZIP
-
-# Find the native SZIP includes and library
-
-# Imported targets
-##################
-
-# This module defines the following :prop_tgt:`IMPORTED` targets:
-#
-# SZIP::SZIP
-#  The SZIP library, if found.
-#
-# Result variables
-###################
-
-# This module will set the following variables in your project:
-
-#  SZIP_FOUND, true if the SZIP headers and libraries were found.
-#  SZIP_INCLUDE_DIR, the directory containing the SZIP headers.
-#  SZIP_INCLUDE_DIRS, the directory containing the SZIP headers.
-#  SZIP_LIBRARIES, libraries to link against to use SZIP.
-
-# Cache variables
-#################
-
-# The following variables may also be set:
-
-#  SZIP_LIBRARY, where to find the SZIP library.
-#  SZIP_LIBRARY_DEBUG - Debug version of SZIP library
-#  SZIP_LIBRARY_RELEASE - Release Version of SZIP library
-
-# message (STATUS "Finding SZIP library and headers..." )
-#########################################################################
-
-
-find_path(SZIP_INCLUDE_DIR szlib.h)
-
-set(szip_names ${SZIP_NAMES} sz szip szip-static libsz libszip libszip-static)
-foreach(name ${szip_names})
-  list (APPEND szip_names_debug "${name}d")
-endforeach()
-
-if(NOT SZIP_LIBRARY)
-  find_library(SZIP_LIBRARY_RELEASE NAMES ${szip_names})
-  find_library(SZIP_LIBRARY_DEBUG NAMES ${szip_names_debug})
-  include(SelectLibraryConfigurations)
-  select_library_configurations(SZIP)
-  mark_as_advanced(SZIP_LIBRARY_RELEASE SZIP_LIBRARY_DEBUG)
-endif()
-unset(szip_names)
-unset(szip_names_debug)
-
-if(SZIP_INCLUDE_DIR AND EXISTS "${SZIP_INCLUDE_DIR}/SZconfig.h")
-    file(STRINGS "${SZIP_INCLUDE_DIR}/SZconfig.h" szip_version_str
-         REGEX "^#define[\t ]+SZIP_PACKAGE_VERSION[\t ]+.*")
-
-    string(REGEX REPLACE "^#define[\t ]+SZIP_PACKAGE_VERSION[\t ]+([0-9]+).*"
-           "\\1" SZIP_VERSION "${szip_version_str}")
-    unset(szip_version_str)
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SZIP
-  REQUIRED_VARS SZIP_LIBRARY SZIP_INCLUDE_DIR
-  VERSION_VAR SZIP_VERSION)
-
-if(SZIP_FOUND)
-  set(SZIP_LIBRARIES ${SZIP_LIBRARY})
-  set(SZIP_INCLUDE_DIRS "${SZIP_INCLUDE_DIR}")
-
-  if(NOT TARGET SZIP::SZIP)
-    add_library(SZIP::SZIP UNKNOWN IMPORTED)
-    if(SZIP_INCLUDE_DIRS)
-      set_target_properties(SZIP::SZIP PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${SZIP_INCLUDE_DIRS}")
-    endif()
-    if(EXISTS "${SZIP_LIBRARY}")
-      set_target_properties(SZIP::SZIP PROPERTIES
-        IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-        IMPORTED_LOCATION "${SZIP_LIBRARY}")
-    endif()
-    if(EXISTS "${SZIP_LIBRARY_RELEASE}")
-      set_property(TARGET SZIP::SZIP APPEND PROPERTY
-        IMPORTED_CONFIGURATIONS RELEASE)
-      set_target_properties(SZIP::SZIP PROPERTIES
-        IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
-        IMPORTED_LOCATION_RELEASE "${SZIP_LIBRARY_RELEASE}")
-    endif()
-    if(EXISTS "${SZIP_LIBRARY_DEBUG}")
-      set_property(TARGET SZIP::SZIP APPEND PROPERTY
-        IMPORTED_CONFIGURATIONS DEBUG)
-      set_target_properties(SZIP::SZIP PROPERTIES
-        IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
-        IMPORTED_LOCATION_DEBUG "${SZIP_LIBRARY_DEBUG}")
-    endif()
-  endif()
-endif()
-
-mark_as_advanced(SZIP_LIBRARY SZIP_INCLUDE_DIR)
-
-# Report the results.
-if (NOT SZIP_FOUND)
-  set (SZIP_DIR_MESSAGE
-      "SZip was not found. Make sure SZIP_LIBRARY and SZIP_INCLUDE_DIR are set or set the SZIP_INSTALL environment variable."
-  )
-  if (NOT SZIP_FIND_QUIETLY)
-    message (VERBOSE "${SZIP_DIR_MESSAGE}")
-  else ()
-    if (SZIP_FIND_REQUIRED)
-      message (FATAL_ERROR "SZip was NOT found and is Required by this project")
-    endif ()
-  endif ()
-endif ()
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake
index e0e1220..be9ceaf 100644
--- a/config/cmake/HDFMacros.cmake
+++ b/config/cmake/HDFMacros.cmake
@@ -77,7 +77,7 @@ macro (INSTALL_TARGET_PDB libtarget targetdestination targetcomponent)
     if (${target_type} MATCHES "SHARED")
       set (targetfilename $<TARGET_PDB_FILE:${libtarget}>)
     else ()
-      get_property (target_name TARGET ${libtarget} PROPERTY $<IF:$<OR:$<CONFIG:Debug>,$<CONFIG:Developer>>,OUTPUT_NAME_DEBUG,OUTPUT_NAME_RELWITHDEBINFO>)
+      get_property (target_name TARGET ${libtarget} PROPERTY "$<IF:$<OR:$<CONFIG:Debug>,$<CONFIG:Developer>>,OUTPUT_NAME_DEBUG,OUTPUT_NAME_RELWITHDEBINFO>")
       set (targetfilename $<TARGET_FILE_DIR:${libtarget}>/${target_name}.pdb)
     endif ()
     install (
@@ -213,8 +213,8 @@ endmacro ()
 #-------------------------------------------------------------------------------
 macro (TARGET_C_PROPERTIES wintarget libtype)
   target_compile_options(${wintarget} PRIVATE
-      $<$<C_COMPILER_ID:MSVC>:${WIN_COMPILE_FLAGS}>
-      $<$<CXX_COMPILER_ID:MSVC>:${WIN_COMPILE_FLAGS}>
+      "$<$<C_COMPILER_ID:MSVC>:${WIN_COMPILE_FLAGS}>"
+      "$<$<CXX_COMPILER_ID:MSVC>:${WIN_COMPILE_FLAGS}>"
   )
   if(MSVC)
     set_property(TARGET ${wintarget} APPEND PROPERTY LINK_FLAGS "${WIN_LINK_FLAGS}")