diff --git a/ports/pbc/portfile.cmake b/ports/pbc/portfile.cmake index 1fd27f8a4a..88bc616836 100644 --- a/ports/pbc/portfile.cmake +++ b/ports/pbc/portfile.cmake @@ -47,9 +47,6 @@ else() PATCHES windows.patch ) - set(CMAKE_FIND_LIBRARY_PREFIXES "") - set(CMAKE_FIND_LIBRARY_SUFFIXES "") - find_path(MPIR_INCLUDE_DIR "gmp.h" HINTS ${CURRENT_INSTALLED_DIR} PATH_SUFFIXES include) if(NOT MPIR_INCLUDE_DIR) message(FATAL_ERROR "GMP includes not found") @@ -73,12 +70,6 @@ else() set(ConfigurationSuffix " DLL") endif() - if(VCPKG_CRT_LINKAGE STREQUAL "static") - set(RuntimeLibraryExt "") - else() - set(RuntimeLibraryExt "DLL") - endif() - if(TRIPLET_SYSTEM_ARCH STREQUAL "x86") set(Platform "Win32") else() @@ -94,18 +85,15 @@ else() file(COPY ${FILES} ${MPIR_LIBRARIES_DBG} DESTINATION "${SOURCE_PATH_PARENT}/mpir/${LibrarySuffix}/${Platform}/Debug") get_filename_component(SOURCE_PATH_SUFFIX ${SOURCE_PATH} NAME) - vcpkg_install_msbuild(SOURCE_PATH ${SOURCE_PATH_PARENT} + vcpkg_msbuild_install(SOURCE_PATH ${SOURCE_PATH_PARENT} PROJECT_SUBPATH ${SOURCE_PATH_SUFFIX}/pbcwin/projects/pbclib.vcxproj - INCLUDES_SUBPATH ${SOURCE_PATH_SUFFIX}/include - LICENSE_SUBPATH ${SOURCE_PATH_SUFFIX}/COPYING RELEASE_CONFIGURATION "Release${ConfigurationSuffix}" DEBUG_CONFIGURATION "Debug${ConfigurationSuffix}" - OPTIONS_DEBUG "/p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}" - OPTIONS_RELEASE "/p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}" OPTIONS /p:SolutionDir=../ - ALLOW_ROOT_INCLUDES ) + vcpkg_install_copyright(FILE_LIST " ${SOURCE_PATH}/COPYING") + file(COPY "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # clean up mpir stuff file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/mpir.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/mpir.lib") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-pbc-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}") diff --git a/ports/pbc/vcpkg.json b/ports/pbc/vcpkg.json index 5a440a2089..d8dec1c255 100644 --- a/ports/pbc/vcpkg.json +++ b/ports/pbc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pbc", "version": "0.5.14", - "port-version": 7, + "port-version": 8, "description": "Pairing-Based Crypto library provides low-level routines for pairing-based cryptosystems.", "homepage": "https://crypto.stanford.edu/pbc", "license": "LGPL-3.0", @@ -14,6 +14,11 @@ { "name": "mpir", "platform": "windows" + }, + { + "name": "vcpkg-msbuild", + "host": true, + "platform": "windows" } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 459d312b8e..70af1807fe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6258,7 +6258,7 @@ }, "pbc": { "baseline": "0.5.14", - "port-version": 7 + "port-version": 8 }, "pcapplusplus": { "baseline": "22.11", diff --git a/versions/p-/pbc.json b/versions/p-/pbc.json index 5da6ca4359..8b766ef4cd 100644 --- a/versions/p-/pbc.json +++ b/versions/p-/pbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "096b1e1d4077f9fbe44e8b0a6fa306e83270c632", + "version": "0.5.14", + "port-version": 8 + }, { "git-tree": "23f4f1804aaa515560fdd3efa19485c9714d2a20", "version": "0.5.14",