3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 11:21:12 +08:00
Code Issues Projects Releases Wiki Activity

[bzip2] Fix tools install directory (#4682)

Browse Source 
* [bzip2] Fix tools install directory

Change to install tools in port name directory. (vcpkg/installed/<triplet>/tools/bzip2)

* [bzip2] Modernize and bump control version
This commit is contained in:
Tsukasa Sugiura 2018-11-09 16:46:54 +09:00 committed by Robert Schumacher
parent f7f06c516d
commit 3f5835d5c4
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/bzip2/CMakeLists.txt
View File

@ -36,7 +36,7 @@ install(TARGETS libbz2
if(NOT BZIP2_SKIP_TOOLS) if(NOT BZIP2_SKIP_TOOLS)
add_executable(bzip2 bzip2.c ${LIBBZ2_SOURCES}) add_executable(bzip2 bzip2.c ${LIBBZ2_SOURCES})
add_executable(bzip2recover bzip2recover.c ${LIBBZ2_SOURCES}) add_executable(bzip2recover bzip2recover.c ${LIBBZ2_SOURCES})
install(TARGETS bzip2 bzip2recover DESTINATION tools) install(TARGETS bzip2 bzip2recover DESTINATION tools/bzip2)
endif() endif()
if(NOT BZIP2_SKIP_HEADERS) if(NOT BZIP2_SKIP_HEADERS)

2
ports/bzip2/CONTROL
View File

@ -1,3 +1,3 @@
Source: bzip2 Source: bzip2
Version: 1.0.6-2 Version: 1.0.6-3
Description: High-quality data compressor. Description: High-quality data compressor.

24
ports/bzip2/portfile.cmake
View File

@ -1,26 +1,27 @@
include(vcpkg_common_functions) include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bzip2-1.0.6) set(BZIP2_VERSION 1.0.6)
vcpkg_download_distfile(ARCHIVE vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/past-due/bzip2-mirror/releases/download/v1.0.6/bzip2-1.0.6.tar.gz" URLS "https://github.com/past-due/bzip2-mirror/releases/download/v${BZIP2_VERSION}/bzip2-${BZIP2_VERSION}.tar.gz"
FILENAME "bzip2-1.0.6.tar.gz" FILENAME "bzip2-${BZIP2_VERSION}.tar.gz"
SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12) SHA512 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12)
vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
REF ${BZIP2_VERSION}
PATCHES
fix-import-export-macros.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/fix-import-export-macros.patch)
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA PREFER_NINJA
OPTIONS_DEBUG OPTIONS_DEBUG
-DBZIP2_SKIP_HEADERS=ON -DBZIP2_SKIP_HEADERS=ON
-DBZIP2_SKIP_TOOLS=ON) -DBZIP2_SKIP_TOOLS=ON
)
vcpkg_install_cmake() vcpkg_install_cmake()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
@ -33,7 +34,6 @@ else()
endif() endif()
file(WRITE ${CURRENT_PACKAGES_DIR}/include/bzlib.h "${BZLIB_H}") file(WRITE ${CURRENT_PACKAGES_DIR}/include/bzlib.h "${BZLIB_H}")
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bzip2) file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bzip2)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/bzip2/LICENSE ${CURRENT_PACKAGES_DIR}/share/bzip2/copyright) file(RENAME ${CURRENT_PACKAGES_DIR}/share/bzip2/LICENSE ${CURRENT_PACKAGES_DIR}/share/bzip2/copyright)