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

[botan][gtest][openmesh][polyclipping][quill] Fix release-only build (#21023)

Browse Source 
Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
Vitalii Koshura 2021-11-04 05:46:49 +01:00 committed by GitHub
parent 7b57292229
commit a882a809a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 80 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ports/botan/portfile.cmake
View File

@ -117,13 +117,21 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE)
message(STATUS "Package ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE} done") message(STATUS "Package ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE} done")
endfunction() endfunction()
BOTAN_BUILD(rel) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
BOTAN_BUILD(dbg) BOTAN_BUILD(rel)
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
BOTAN_BUILD(dbg)
endif()
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(RENAME "${CURRENT_PACKAGES_DIR}/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc") endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc")
endif()
vcpkg_fixup_pkgconfig() vcpkg_fixup_pkgconfig()
file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-2/botan" "${CURRENT_PACKAGES_DIR}/include/botan") file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-2/botan" "${CURRENT_PACKAGES_DIR}/include/botan")

2
ports/botan/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "botan", "name": "botan",
"version": "2.18.1", "version": "2.18.1",
"port-version": 1, "port-version": 2,
"description": "A cryptography library written in C++11", "description": "A cryptography library written in C++11",
"homepage": "https://botan.randombit.net", "homepage": "https://botan.randombit.net",
"supports": "!(windows & arm)", "supports": "!(windows & arm)",

12
ports/gtest/portfile.cmake
View File

@ -47,10 +47,14 @@ file(
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
vcpkg_fixup_pkgconfig() vcpkg_fixup_pkgconfig()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gmock_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gtest_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gmock_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gmock_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gtest_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gtest_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gmock_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gtest_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link")
endif()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
ports/gtest/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "gtest", "name": "gtest",
"version-semver": "1.11.0", "version-semver": "1.11.0",
"port-version": 1, "port-version": 2,
"description": "GoogleTest and GoogleMock testing frameworks", "description": "GoogleTest and GoogleMock testing frameworks",
"homepage": "https://github.com/google/googletest" "homepage": "https://github.com/google/googletest"
} }

14
ports/openmesh/portfile.cmake
View File

@ -32,8 +32,12 @@ vcpkg_install_cmake()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/OpenMesh/cmake TARGET_PATH share/OpenMesh/cmake) vcpkg_fixup_cmake_targets(CONFIG_PATH share/OpenMesh/cmake TARGET_PATH share/OpenMesh/cmake)
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libdata/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(RENAME "${CURRENT_PACKAGES_DIR}/libdata/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libdata/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(RENAME "${CURRENT_PACKAGES_DIR}/libdata/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/libdata" "${CURRENT_PACKAGES_DIR}/libdata") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/libdata" "${CURRENT_PACKAGES_DIR}/libdata")
vcpkg_fixup_pkgconfig() vcpkg_fixup_pkgconfig()
@ -41,12 +45,16 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/OpenMesh/Tools/VDPM/xpm) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/OpenMesh/Tools/VDPM/xpm)
# Only move dynamic libraries to bin on Windows # Only move dynamic libraries to bin on Windows
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
file(RENAME ${CURRENT_PACKAGES_DIR}/OpenMeshCore.dll ${CURRENT_PACKAGES_DIR}/bin/OpenMeshCore.dll) file(RENAME ${CURRENT_PACKAGES_DIR}/OpenMeshCore.dll ${CURRENT_PACKAGES_DIR}/bin/OpenMeshCore.dll)
file(RENAME ${CURRENT_PACKAGES_DIR}/OpenMeshTools.dll ${CURRENT_PACKAGES_DIR}/bin/OpenMeshTools.dll) file(RENAME ${CURRENT_PACKAGES_DIR}/OpenMeshTools.dll ${CURRENT_PACKAGES_DIR}/bin/OpenMeshTools.dll)
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/OpenMeshCored.dll ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMeshCored.dll) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/OpenMeshCored.dll ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMeshCored.dll)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/OpenMeshToolsd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMeshToolsd.dll) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/OpenMeshToolsd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMeshToolsd.dll)
endif()
endif() endif()
configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY)

2
ports/openmesh/vcpkg.json
View File

@ -1,6 +1,6 @@
{ {
"name": "openmesh", "name": "openmesh",
"version-string": "8.1", "version-string": "8.1",
"port-version": 2, "port-version": 3,
"description": "A generic and efficient polygon mesh data structure" "description": "A generic and efficient polygon mesh data structure"
} }

8
ports/polyclipping/portfile.cmake
View File

@ -19,8 +19,12 @@ vcpkg_configure_cmake(
vcpkg_install_cmake() vcpkg_install_cmake()
vcpkg_fixup_cmake_targets() vcpkg_fixup_cmake_targets()
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
endif()
vcpkg_fixup_pkgconfig() vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

2
ports/polyclipping/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "polyclipping", "name": "polyclipping",
"version-string": "6.4.2", "version-string": "6.4.2",
"port-version": 9, "port-version": 10,
"description": "The Clipper library performs clipping and offsetting for both lines and polygons. All four boolean clipping operations are supported - intersection, union, difference and exclusive-or. Polygons can be of any shape including self-intersecting polygons.", "description": "The Clipper library performs clipping and offsetting for both lines and polygons. All four boolean clipping operations are supported - intersection, union, difference and exclusive-or. Polygons can be of any shape including self-intersecting polygons.",
"homepage": "https://sourceforge.net/projects/polyclipping/" "homepage": "https://sourceforge.net/projects/polyclipping/"
} }

8
ports/quill/portfile.cmake
View File

@ -21,8 +21,12 @@ vcpkg_cmake_configure(
vcpkg_cmake_install() vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/quill) vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/quill)
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(RENAME "${CURRENT_PACKAGES_DIR}/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(RENAME "${CURRENT_PACKAGES_DIR}/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
endif()
vcpkg_fixup_pkgconfig() vcpkg_fixup_pkgconfig()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h" "// #define QUILL_FMT_EXTERNAL" "#define QUILL_FMT_EXTERNAL") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h" "// #define QUILL_FMT_EXTERNAL" "#define QUILL_FMT_EXTERNAL")

2
ports/quill/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "quill", "name": "quill",
"version-semver": "1.6.3", "version-semver": "1.6.3",
"port-version": 2, "port-version": 3,
"description": "C++14 Asynchronous Low Latency Logging Library", "description": "C++14 Asynchronous Low Latency Logging Library",
"homepage": "https://github.com/odygrd/quill/", "homepage": "https://github.com/odygrd/quill/",
"supports": "!(uwp | android)", "supports": "!(uwp | android)",

5
versions/b-/botan.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "5f002dd083e6eedd3bdd1d2bc7882d34d70ed438",
"version": "2.18.1",
"port-version": 2
},
{ {
"git-tree": "9257baaf49b708cde128ff31e74fe848ef30a264", "git-tree": "9257baaf49b708cde128ff31e74fe848ef30a264",
"version": "2.18.1", "version": "2.18.1",

10
versions/baseline.json
View File

@ -1126,7 +1126,7 @@
}, },
"botan": { "botan": {
"baseline": "2.18.1", "baseline": "2.18.1",
"port-version": 1 "port-version": 2
}, },
"box2d": { "box2d": {
"baseline": "2.4.1", "baseline": "2.4.1",
@ -2586,7 +2586,7 @@
}, },
"gtest": { "gtest": {
"baseline": "1.11.0", "baseline": "1.11.0",
"port-version": 1 "port-version": 2
}, },
"gtk": { "gtk": {
"baseline": "4.3.0", "baseline": "4.3.0",
@ -4922,7 +4922,7 @@
}, },
"openmesh": { "openmesh": {
"baseline": "8.1", "baseline": "8.1",
"port-version": 2 "port-version": 3
}, },
"openmpi": { "openmpi": {
"baseline": "4.1.0", "baseline": "4.1.0",
@ -5270,7 +5270,7 @@
}, },
"polyclipping": { "polyclipping": {
"baseline": "6.4.2", "baseline": "6.4.2",
"port-version": 9 "port-version": 10
}, },
"polyhook2": { "polyhook2": {
"baseline": "2021-05-09", "baseline": "2021-05-09",
@ -5778,7 +5778,7 @@
}, },
"quill": { "quill": {
"baseline": "1.6.3", "baseline": "1.6.3",
"port-version": 2 "port-version": 3
}, },
"quirc": { "quirc": {
"baseline": "1.1", "baseline": "1.1",

5
versions/g-/gtest.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "c87cf62264002bc0cf2cb772a5588b36576323a9",
"version-semver": "1.11.0",
"port-version": 2
},
{ {
"git-tree": "e95c8da96b4a206c21d0197e5547e921d748d166", "git-tree": "e95c8da96b4a206c21d0197e5547e921d748d166",
"version-semver": "1.11.0", "version-semver": "1.11.0",

5
versions/o-/openmesh.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "27929cc382c7b9cba46891aeed71e44fc5e2c31a",
"version-string": "8.1",
"port-version": 3
},
{ {
"git-tree": "19e385c7e6a18248b06db012c7ba0a68e98921a7", "git-tree": "19e385c7e6a18248b06db012c7ba0a68e98921a7",
"version-string": "8.1", "version-string": "8.1",

5
versions/p-/polyclipping.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "9e4c4bb3964361c1db87e2bdc368e5e32d0bb213",
"version-string": "6.4.2",
"port-version": 10
},
{ {
"git-tree": "6701622648b7f5ab04e6552b312d1cd8543de99c", "git-tree": "6701622648b7f5ab04e6552b312d1cd8543de99c",
"version-string": "6.4.2", "version-string": "6.4.2",

5
versions/q-/quill.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "037a819f5cf482d84083318e120e076c711a2760",
"version-semver": "1.6.3",
"port-version": 3
},
{ {
"git-tree": "1d6790b5d6faf5173c73ea42e07acea665aebffc", "git-tree": "1d6790b5d6faf5173c73ea42e07acea665aebffc",
"version-semver": "1.6.3", "version-semver": "1.6.3",