[qpid-proton] Fix qpid proton #23580 (#23581)

* Fix microsoft/vcpkg#23580

* Add version
This commit is contained in:
Kevin Lalumiere 2022-03-16 20:59:24 -04:00 committed by GitHub
parent 71d274d7ce
commit 6b6f5a82de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 4 deletions

View File

@ -16,8 +16,6 @@ vcpkg_cmake_configure(
-DPYTHON_EXECUTABLE=${PYTHON3}
-DLIB_SUFFIX=
-DBUILD_GO=no
-DBUILD_RUBY=no
-DBUILD_PYTHON=no
-DENABLE_JSONCPP=ON
-DCMAKE_DISABLE_FIND_PACKAGE_CyrusSASL=ON
)
@ -26,8 +24,24 @@ vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
set(configFiles
"${CURRENT_PACKAGES_DIR}/share/${PORT}/Proton/ProtonConfig.cmake"
"${CURRENT_PACKAGES_DIR}/share/${PORT}/ProtonCpp/ProtonCppConfig.cmake"
)
foreach(configFile IN LISTS configFiles)
vcpkg_replace_string("${configFile}"
"IMPORTED_LOCATION_DEBUG \"\${_IMPORT_PREFIX}/lib"
"IMPORTED_LOCATION_DEBUG \"\${_IMPORT_PREFIX}/debug/lib"
)
vcpkg_replace_string("${configFile}"
"debug \${_IMPORT_PREFIX}/lib"
"debug \${_IMPORT_PREFIX}/debug/lib"
)
endforeach()
vcpkg_fixup_pkgconfig()
configure_file(${CMAKE_CURRENT_LIST_DIR}/qpid-protonConfig.cmake
${CURRENT_PACKAGES_DIR}/share/${PORT}/qpid-protonConfig.cmake COPYONLY)
file(RENAME "${CURRENT_PACKAGES_DIR}/share/proton/LICENSE.txt"
"${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")

View File

@ -0,0 +1,4 @@
get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE)
set(_IMPORT_PREFIX "${PACKAGE_PREFIX_DIR}")
include(${CMAKE_CURRENT_LIST_DIR}/Proton/ProtonConfig.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/ProtonCpp/ProtonCppConfig.cmake)

View File

@ -1,7 +1,7 @@
{
"name": "qpid-proton",
"version": "0.32.0",
"port-version": 2,
"port-version": 3,
"description": "Qpid Proton is a high-performance, lightweight messaging library.",
"homepage": "https://github.com/apache/qpid-proton",
"dependencies": [

View File

@ -5610,7 +5610,7 @@
},
"qpid-proton": {
"baseline": "0.32.0",
"port-version": 2
"port-version": 3
},
"qscintilla": {
"baseline": "2.12.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "109a9bb4fac5d5c5a52cd620d7ddb22da6fe47f7",
"version": "0.32.0",
"port-version": 3
},
{
"git-tree": "c6ab0bd896fa44681e2c3d4b325915ddacb38a1a",
"version": "0.32.0",