diff options
| author | Jimmy Lee <l02n20l@qq.com> | 2021-07-23 06:48:47 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 15:48:47 -0700 |
| commit | dad6d642764eb5b798bcd5b082516bf06e922265 (patch) | |
| tree | 30345148d687a27fb87e79be70597e5b925a5aeb /ports | |
| parent | f241ffc3f03cd3664f242125d21e9967c20ae94a (diff) | |
| download | vcpkg-dad6d642764eb5b798bcd5b082516bf06e922265.tar.gz vcpkg-dad6d642764eb5b798bcd5b082516bf06e922265.zip | |
[liblzma] add install bundle for support build target for ios platform. (#18829)
* [liblzma] add install bundle for support build target for ios platform.
* Remove the deprecated functions
* format vcpkg.json
* Update the baseline version
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/liblzma/CONTROL | 5 | ||||
| -rw-r--r-- | ports/liblzma/add_support_ios.patch | 23 | ||||
| -rw-r--r-- | ports/liblzma/portfile.cmake | 18 | ||||
| -rw-r--r-- | ports/liblzma/vcpkg.json | 17 |
4 files changed, 49 insertions, 14 deletions
diff --git a/ports/liblzma/CONTROL b/ports/liblzma/CONTROL deleted file mode 100644 index da00befc3..000000000 --- a/ports/liblzma/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: liblzma -Version: 5.2.5 -Port-Version: 2 -Homepage: https://github.com/xz-mirror/xz -Description: Compression library with an API similar to that of zlib. diff --git a/ports/liblzma/add_support_ios.patch b/ports/liblzma/add_support_ios.patch new file mode 100644 index 000000000..ac40c4e6d --- /dev/null +++ b/ports/liblzma/add_support_ios.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 52439b3..0b5e371 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -526,6 +526,7 @@ if(HAVE_GETOPT_LONG) + + install(TARGETS xzdec + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT xzdec) + + if(UNIX) +@@ -653,6 +654,7 @@ if(NOT MSVC AND HAVE_GETOPT_LONG) + + install(TARGETS xz + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT xz) + + install(FILES src/xz/xz.1 +-- +2.30.1 (Apple Git-130) + diff --git a/ports/liblzma/portfile.cmake b/ports/liblzma/portfile.cmake index e58a0e543..e653cbcce 100644 --- a/ports/liblzma/portfile.cmake +++ b/ports/liblzma/portfile.cmake @@ -8,15 +8,15 @@ vcpkg_from_github( enable-uwp-builds.patch fix_config_include.patch win_output_name.patch # Fix output name on Windows. Autotool build does not generate lib prefixed libraries on windows. + add_support_ios.patch # add install bundle info for support ios ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DCMAKE_DEBUG_POSTFIX=d" # This was in the old vcpkg CMakeLists.txt and I don't intend to fix it all over vcpkg ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() set(exec_prefix "\${prefix}") @@ -39,7 +39,7 @@ endif() vcpkg_fixup_pkgconfig() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/liblzma) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/liblzma) file(WRITE "${CURRENT_PACKAGES_DIR}/share/liblzma/liblzma-config.cmake" "include(\"\${CMAKE_CURRENT_LIST_DIR}/liblzmaConfig.cmake\")") file(APPEND "${CURRENT_PACKAGES_DIR}/share/liblzma/liblzmaConfig.cmake" @@ -100,9 +100,9 @@ endif() file(WRITE ${CURRENT_PACKAGES_DIR}/include/lzma.h "${_contents}") if (VCPKG_BUILD_TYPE STREQUAL debug) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/include") else() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -113,7 +113,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) ) endif() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") set(TOOLS xz xzdec) @@ -130,5 +130,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
\ No newline at end of file diff --git a/ports/liblzma/vcpkg.json b/ports/liblzma/vcpkg.json new file mode 100644 index 000000000..fb6c4097e --- /dev/null +++ b/ports/liblzma/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "liblzma", + "version-semver": "5.2.5", + "port-version": 3, + "description": "Compression library with an API similar to that of zlib.", + "homepage": "hhttps://github.com/xz-mirror/xz", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} |
