From a882a809a3eaa03d5a064f356ea5a3ab6008ec82 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Thu, 4 Nov 2021 05:46:49 +0100 Subject: [PATCH] [botan][gtest][openmesh][polyclipping][quill] Fix release-only build (#21023) Signed-off-by: Vitalii Koshura Co-authored-by: Billy Robert O'Neal III --- ports/botan/portfile.cmake | 20 ++++++++++++++------ ports/botan/vcpkg.json | 2 +- ports/gtest/portfile.cmake | 12 ++++++++---- ports/gtest/vcpkg.json | 2 +- ports/openmesh/portfile.cmake | 14 +++++++++++--- ports/openmesh/vcpkg.json | 2 +- ports/polyclipping/portfile.cmake | 8 ++++++-- ports/polyclipping/vcpkg.json | 2 +- ports/quill/portfile.cmake | 8 ++++++-- ports/quill/vcpkg.json | 2 +- versions/b-/botan.json | 5 +++++ versions/baseline.json | 10 +++++----- versions/g-/gtest.json | 5 +++++ versions/o-/openmesh.json | 5 +++++ versions/p-/polyclipping.json | 5 +++++ versions/q-/quill.json | 5 +++++ 16 files changed, 80 insertions(+), 27 deletions(-) diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index ea5fae8de0..d6b678e6e6 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -117,13 +117,21 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE) message(STATUS "Package ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE} done") endfunction() -BOTAN_BUILD(rel) -BOTAN_BUILD(dbg) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + 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") -file(RENAME "${CURRENT_PACKAGES_DIR}/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc") -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") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/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() file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-2/botan" "${CURRENT_PACKAGES_DIR}/include/botan") diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index 809346855a..09e20ed5ce 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,7 +1,7 @@ { "name": "botan", "version": "2.18.1", - "port-version": 1, + "port-version": 2, "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "supports": "!(windows & arm)", diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake index 97086c5bc3..b7e609242c 100644 --- a/ports/gtest/portfile.cmake +++ b/ports/gtest/portfile.cmake @@ -47,10 +47,14 @@ file( file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_fixup_pkgconfig() -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}/lib/pkgconfig/gtest_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}/debug/lib/pkgconfig/gtest_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/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") +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() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/gtest/vcpkg.json b/ports/gtest/vcpkg.json index b90a78d676..5c878ed29a 100644 --- a/ports/gtest/vcpkg.json +++ b/ports/gtest/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gtest", "version-semver": "1.11.0", - "port-version": 1, + "port-version": 2, "description": "GoogleTest and GoogleMock testing frameworks", "homepage": "https://github.com/google/googletest" } diff --git a/ports/openmesh/portfile.cmake b/ports/openmesh/portfile.cmake index 08f173929e..28ea0e490f 100644 --- a/ports/openmesh/portfile.cmake +++ b/ports/openmesh/portfile.cmake @@ -32,8 +32,12 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() 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") -file(RENAME "${CURRENT_PACKAGES_DIR}/libdata/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + 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") 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) # Only move dynamic libraries to bin on Windows 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}/debug/bin) 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) + 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/OpenMeshToolsd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMeshToolsd.dll) + endif() endif() configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) diff --git a/ports/openmesh/vcpkg.json b/ports/openmesh/vcpkg.json index 80c5f197b6..ab48f6d5f2 100644 --- a/ports/openmesh/vcpkg.json +++ b/ports/openmesh/vcpkg.json @@ -1,6 +1,6 @@ { "name": "openmesh", "version-string": "8.1", - "port-version": 2, + "port-version": 3, "description": "A generic and efficient polygon mesh data structure" } diff --git a/ports/polyclipping/portfile.cmake b/ports/polyclipping/portfile.cmake index 9c95382536..260fb93df3 100644 --- a/ports/polyclipping/portfile.cmake +++ b/ports/polyclipping/portfile.cmake @@ -19,8 +19,12 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets() -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + 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() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/polyclipping/vcpkg.json b/ports/polyclipping/vcpkg.json index a57d032a8e..195a0ae4d5 100644 --- a/ports/polyclipping/vcpkg.json +++ b/ports/polyclipping/vcpkg.json @@ -1,7 +1,7 @@ { "name": "polyclipping", "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.", "homepage": "https://sourceforge.net/projects/polyclipping/" } diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 2d1699be8a..6bc0398c42 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -21,8 +21,12 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/quill) -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") -file(RENAME "${CURRENT_PACKAGES_DIR}/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + 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_replace_string("${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h" "// #define QUILL_FMT_EXTERNAL" "#define QUILL_FMT_EXTERNAL") diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index e01b4e275a..9057a3ec89 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,7 +1,7 @@ { "name": "quill", "version-semver": "1.6.3", - "port-version": 2, + "port-version": 3, "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "supports": "!(uwp | android)", diff --git a/versions/b-/botan.json b/versions/b-/botan.json index 870044f359..27ad0e37e3 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f002dd083e6eedd3bdd1d2bc7882d34d70ed438", + "version": "2.18.1", + "port-version": 2 + }, { "git-tree": "9257baaf49b708cde128ff31e74fe848ef30a264", "version": "2.18.1", diff --git a/versions/baseline.json b/versions/baseline.json index bb7f583fa6..cdfd5030b0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1126,7 +1126,7 @@ }, "botan": { "baseline": "2.18.1", - "port-version": 1 + "port-version": 2 }, "box2d": { "baseline": "2.4.1", @@ -2586,7 +2586,7 @@ }, "gtest": { "baseline": "1.11.0", - "port-version": 1 + "port-version": 2 }, "gtk": { "baseline": "4.3.0", @@ -4922,7 +4922,7 @@ }, "openmesh": { "baseline": "8.1", - "port-version": 2 + "port-version": 3 }, "openmpi": { "baseline": "4.1.0", @@ -5270,7 +5270,7 @@ }, "polyclipping": { "baseline": "6.4.2", - "port-version": 9 + "port-version": 10 }, "polyhook2": { "baseline": "2021-05-09", @@ -5778,7 +5778,7 @@ }, "quill": { "baseline": "1.6.3", - "port-version": 2 + "port-version": 3 }, "quirc": { "baseline": "1.1", diff --git a/versions/g-/gtest.json b/versions/g-/gtest.json index 1bbfb49970..9e36d3358c 100644 --- a/versions/g-/gtest.json +++ b/versions/g-/gtest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c87cf62264002bc0cf2cb772a5588b36576323a9", + "version-semver": "1.11.0", + "port-version": 2 + }, { "git-tree": "e95c8da96b4a206c21d0197e5547e921d748d166", "version-semver": "1.11.0", diff --git a/versions/o-/openmesh.json b/versions/o-/openmesh.json index 164c3fbf16..065503d588 100644 --- a/versions/o-/openmesh.json +++ b/versions/o-/openmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27929cc382c7b9cba46891aeed71e44fc5e2c31a", + "version-string": "8.1", + "port-version": 3 + }, { "git-tree": "19e385c7e6a18248b06db012c7ba0a68e98921a7", "version-string": "8.1", diff --git a/versions/p-/polyclipping.json b/versions/p-/polyclipping.json index 4c9bf56ae5..df88ddb4c2 100644 --- a/versions/p-/polyclipping.json +++ b/versions/p-/polyclipping.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e4c4bb3964361c1db87e2bdc368e5e32d0bb213", + "version-string": "6.4.2", + "port-version": 10 + }, { "git-tree": "6701622648b7f5ab04e6552b312d1cd8543de99c", "version-string": "6.4.2", diff --git a/versions/q-/quill.json b/versions/q-/quill.json index a300b7fe2f..da355a2fc5 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "037a819f5cf482d84083318e120e076c711a2760", + "version-semver": "1.6.3", + "port-version": 3 + }, { "git-tree": "1d6790b5d6faf5173c73ea42e07acea665aebffc", "version-semver": "1.6.3",