mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 05:49:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[szip] Change default component to match build type

Browse Source
This commit is contained in:
Robert Schumacher 2017-02-27 23:23:23 -08:00
parent 2d3fa9d7f4
commit 20c92a800f
3 changed files with 39 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
Version: 2.1-1
Description: Szip compression software, providing lossless compression of scientific data

37
ports/szip/default-component-shared.patch Normal file
View File

@ -0,0 +1,37 @@
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:

1
ports/szip/portfile.cmake
View File

@ -25,6 +25,7 @@ vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/disable-static-lib-in-shared-build.patch
${CMAKE_CURRENT_LIST_DIR}/default-component-shared.patch
)
vcpkg_configure_cmake(