diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-03-14 23:12:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-14 23:12:31 -0700 |
| commit | d72e38036ba1eedeed87cf65c6673df37d0cc2b1 (patch) | |
| tree | 8bf6b3067bab819836870f8aea0d44fbfc287a92 /ports/szip/default-component-shared.patch | |
| parent | 7d701a92a36fa665b860643b7837d5f18d9fd9cd (diff) | |
| parent | d5fbb5e0e7038dbcdae21c2b956c3213331a6fd6 (diff) | |
| download | vcpkg-d72e38036ba1eedeed87cf65c6673df37d0cc2b1.tar.gz vcpkg-d72e38036ba1eedeed87cf65c6673df37d0cc2b1.zip | |
Merge pull request #5574 from Neumann-A/VTK_8.2.0
[VTK 8.2.0/HDF5 1.10.5] Upgrade VTK and HDF5
Diffstat (limited to 'ports/szip/default-component-shared.patch')
| -rw-r--r-- | ports/szip/default-component-shared.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/ports/szip/default-component-shared.patch b/ports/szip/default-component-shared.patch deleted file mode 100644 index 3db94c503..000000000 --- a/ports/szip/default-component-shared.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d4163a0..4e2a312 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -267,6 +267,14 @@ set (SZIP_VERSION_MAJOR ${SZIP_PACKAGE_VERSION_MAJOR}) - set (SZIP_VERSION_MINOR ${SZIP_PACKAGE_VERSION_MINOR}) - - #----------------------------------------------------------------------------- -+# Set default component -+#----------------------------------------------------------------------------- -+set (SZIP_DEFAULT_COMPONENT static) -+if (BUILD_SHARED_LIBS) -+ set (SZIP_DEFAULT_COMPONENT shared) -+endif () -+ -+#----------------------------------------------------------------------------- - # Configure the szip-config.cmake file for the build directory - #----------------------------------------------------------------------------- - set(INCLUDE_INSTALL_DIR ${SZIP_INSTALL_INCLUDE_DIR} ) -diff --git a/config/cmake/szip-config.cmake.in b/config/cmake/szip-config.cmake.in -index 4a7fec7..ad54287 100644 ---- a/config/cmake/szip-config.cmake.in -+++ b/config/cmake/szip-config.cmake.in -@@ -37,10 +37,10 @@ if (NOT TARGET "@SZIP_PACKAGE@") - include (@PACKAGE_SHARE_INSTALL_DIR@/@SZIP_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake) - endif () - --# Handle default component(static) : -+# Handle default component(@SZIP_DEFAULT_COMPONENT@) : - if (NOT ${SZIP_PACKAGE_NAME}_FIND_COMPONENTS) -- set (${SZIP_PACKAGE_NAME}_FIND_COMPONENTS static) -- set (${SZIP_PACKAGE_NAME}_FIND_REQUIRED_static true) -+ set (${SZIP_PACKAGE_NAME}_FIND_COMPONENTS @SZIP_DEFAULT_COMPONENT@) -+ set (${SZIP_PACKAGE_NAME}_FIND_REQUIRED_@SZIP_DEFAULT_COMPONENT@ true) - endif () - - # Handle requested components: |