diff options
| author | Hiroshi Miura <miurahr@linux.com> | 2018-02-17 20:19:15 +0900 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-02-17 03:19:15 -0800 |
| commit | 463775e913b06a11bb5c2acbd597790e834def93 (patch) | |
| tree | 240e56448b21d6352ca8bd51950a47187196b88a | |
| parent | 18be859328565eec58b6eb5952b585f66cb6b6fd (diff) | |
| download | vcpkg-463775e913b06a11bb5c2acbd597790e834def93.tar.gz vcpkg-463775e913b06a11bb5c2acbd597790e834def93.zip | |
[szip] Fix szip-config.cmake to return SZIP_FOUND (#2765)
In current implementation, it returns only SZIP_static_FOUND or
SZIP_shared_FOUND.
szip-config.cmake calls check_required_components(SZIP) helper, but
it just set SZIP_FOUND=FALSE when it does not find required componets,
but never set SZIP_FOUND=TRUE.
szip-config.cmake should set SZIP_FOUND=TRUE when it find some
components before calling the helper function.
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
| -rw-r--r-- | ports/szip/CONTROL | 2 | ||||
| -rw-r--r-- | ports/szip/fix-szip-config-to-set-szip-found.patch | 11 | ||||
| -rw-r--r-- | ports/szip/portfile.cmake | 1 |
3 files changed, 13 insertions, 1 deletions
diff --git a/ports/szip/CONTROL b/ports/szip/CONTROL index 37923213a..ca2093d66 100644 --- a/ports/szip/CONTROL +++ b/ports/szip/CONTROL @@ -1,3 +1,3 @@ Source: szip -Version: 2.1.1 +Version: 2.1.1-1 Description: Szip compression software, providing lossless compression of scientific data diff --git a/ports/szip/fix-szip-config-to-set-szip-found.patch b/ports/szip/fix-szip-config-to-set-szip-found.patch new file mode 100644 index 000000000..f662916f9 --- /dev/null +++ b/ports/szip/fix-szip-config-to-set-szip-found.patch @@ -0,0 +1,11 @@ +diff -urN szip-2.1.1-a/config/cmake/szip-config.cmake.in szip-2.1.1-b/config/cmake/szip-config.cmake.in +--- szip-2.1.1-a/config/cmake/szip-config.cmake.in 2018-02-10 11:06:46.890685077 +0900 ++++ szip-2.1.1-b/config/cmake/szip-config.cmake.in 2018-02-10 11:11:25.369274127 +0900 +@@ -51,6 +51,7 @@ + set (${SZIP_PACKAGE_NAME}_${comp}_FOUND 0) + else () + set (${SZIP_PACKAGE_NAME}_${comp}_FOUND 1) ++ set (${SZIP_PACKAGE_NAME}_FOUND 1) + string(TOUPPER ${SZIP_PACKAGE_NAME}_${comp}_LIBRARY COMP_LIBRARY) + set (${COMP_LIBRARY} ${${COMP_LIBRARY}} @SZIP_LIB_CORENAME@-${comp}) + endif () diff --git a/ports/szip/portfile.cmake b/ports/szip/portfile.cmake index 39d5646ee..9fcd22ba1 100644 --- a/ports/szip/portfile.cmake +++ b/ports/szip/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_apply_patches( PATCHES ${CMAKE_CURRENT_LIST_DIR}/disable-static-lib-in-shared-build.patch ${CMAKE_CURRENT_LIST_DIR}/default-component-shared.patch + ${CMAKE_CURRENT_LIST_DIR}/fix-szip-config-to-set-szip-found.patch ) vcpkg_configure_cmake( |