Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Mar 17, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c161bbd
Fix microsoft/vcpkg#23580
klalumiere Mar 15, 2022
fa208b6
Add version
klalumiere Mar 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions ports/qpid-proton/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand All @@ -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")

Expand Down
4 changes: 4 additions & 0 deletions ports/qpid-proton/qpid-protonConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion ports/qpid-proton/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5606,7 +5606,7 @@
},
"qpid-proton": {
"baseline": "0.32.0",
"port-version": 2
"port-version": 3
},
"qscintilla": {
"baseline": "2.12.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qpid-proton.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "109a9bb4fac5d5c5a52cd620d7ddb22da6fe47f7",
"version": "0.32.0",
"port-version": 3
},
{
"git-tree": "c6ab0bd896fa44681e2c3d4b325915ddacb38a1a",
"version": "0.32.0",
Expand Down