3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 03:27:58 +08:00
Code Issues Projects Releases Wiki Activity

[szip] Fix szip-config.cmake to return SZIP_FOUND (#2765)

Browse Source 
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>
This commit is contained in:
Hiroshi Miura 2018-02-17 20:19:15 +09:00 committed by Robert Schumacher
parent 18be859328
commit 463775e913
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/szip/CONTROL
View File

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

11
ports/szip/fix-szip-config-to-set-szip-found.patch Normal file
View File

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

1
ports/szip/portfile.cmake
View File

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