diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake index 347d89883f..3e29c19ee1 100644 --- a/ports/qpid-proton/portfile.cmake +++ b/ports/qpid-proton/portfile.cmake @@ -15,6 +15,11 @@ file(REMOVE "${SOURCE_PATH}/tools/cmake/Modules/FindJsonCpp.cmake") vcpkg_find_acquire_program(PYTHON3) +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) + set(rpath "@loader_path") +else() + set(rpath "\$ORIGIN") +endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE # It may cause call CHECK_LIBRARY_EXISTS before call project to set the language @@ -28,6 +33,7 @@ vcpkg_cmake_configure( -DENABLE_BENCHMARKS=OFF -DENABLE_FUZZ_TESTING=OFF -DBUILD_TESTING=OFF + -DCMAKE_INSTALL_RPATH=${rpath} -DPython_EXECUTABLE=${PYTHON3} ) diff --git a/ports/qpid-proton/vcpkg.json b/ports/qpid-proton/vcpkg.json index 604cb1df4d..c57969ea32 100644 --- a/ports/qpid-proton/vcpkg.json +++ b/ports/qpid-proton/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qpid-proton", "version": "0.37.0", - "port-version": 1, + "port-version": 2, "description": "Qpid Proton is a high-performance, lightweight messaging library.", "homepage": "https://github.com/apache/qpid-proton", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 5e62a2b29b..f6ad819898 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5658,7 +5658,7 @@ }, "qpid-proton": { "baseline": "0.37.0", - "port-version": 1 + "port-version": 2 }, "qscintilla": { "baseline": "2.12.0", diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json index 2b30ab71e1..95a109f9dc 100644 --- a/versions/q-/qpid-proton.json +++ b/versions/q-/qpid-proton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e019a7a0cb758104296c13689ca86f44db64cfb6", + "version": "0.37.0", + "port-version": 2 + }, { "git-tree": "543baa82530f5eb5ed9b3d6348a14b5e24ccda64", "version": "0.37.0",