mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[apr] no absolute paths (#25816)
This commit is contained in:
parent
5a7c56f934
commit
9ab9880238
@ -75,10 +75,15 @@ else()
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "APR_SOURCE_DIR=\"${SOURCE_PATH}\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "APR_BUILD_DIR=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel\"" "")
|
||||
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/build-1/libtool" "${CURRENT_INSTALLED_DIR}/lib" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/build-1/libtool" "${CURRENT_INSTALLED_DIR}/debug/lib" "")
|
||||
if(NOT VCPKG_BUILD_TYPE)
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "\"${CURRENT_INSTALLED_DIR}/debug\"" "`dirname $0`/../../../..")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_SOURCE_DIR=\"${SOURCE_PATH}\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_BUILD_DIR=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg\"" "")
|
||||
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/build-1/libtool" "${CURRENT_INSTALLED_DIR}/lib" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/build-1/libtool" "${CURRENT_INSTALLED_DIR}/debug/lib" "")
|
||||
endif()
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
endif()
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "apr",
|
||||
"version": "1.7.0",
|
||||
"port-version": 9,
|
||||
"port-version": 10,
|
||||
"description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.",
|
||||
"homepage": "https://apr.apache.org/",
|
||||
"license": "Apache-2.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "7b9002157134602da80c38b7eda863fd9e0012da",
|
||||
"version": "1.7.0",
|
||||
"port-version": 10
|
||||
},
|
||||
{
|
||||
"git-tree": "419034d960a2d9d932f18154e386d1ce4947d514",
|
||||
"version": "1.7.0",
|
||||
|
@ -118,7 +118,7 @@
|
||||
},
|
||||
"apr": {
|
||||
"baseline": "1.7.0",
|
||||
"port-version": 9
|
||||
"port-version": 10
|
||||
},
|
||||
"apr-util": {
|
||||
"baseline": "1.6.1",
|
||||
|
Loading…
x
Reference in New Issue
Block a user