From 6cbeef851eabee66fa060b09b88859e9a2162c85 Mon Sep 17 00:00:00 2001 From: xventura81 Date: Fri, 26 May 2023 22:44:55 +0200 Subject: [PATCH] [activemq-cpp] Update activemq-cppConfig.cmake (#31623) * Update activemq-cppConfig.cmake libapr-1.dll has to be found in bin/ folder * Update activemq-cpp port version to 13 --------- Co-authored-by: Xavier Ventura --- ports/activemq-cpp/activemq-cppConfig.cmake | 4 ++-- ports/activemq-cpp/vcpkg.json | 2 +- versions/a-/activemq-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/activemq-cpp/activemq-cppConfig.cmake b/ports/activemq-cpp/activemq-cppConfig.cmake index 5719f9b6bb..715a1630d9 100644 --- a/ports/activemq-cpp/activemq-cppConfig.cmake +++ b/ports/activemq-cpp/activemq-cppConfig.cmake @@ -133,9 +133,9 @@ if (ACTIVEMQ_CPP_DLL_RELEASE) # if (ACTIVEMQ_CPP_LIB_RELEASE AND ACTIVEMQ_CPP_DLL_DEBUG AND ACTIVEMQ_CPP_LIB_DEBUG) _set_exists(ACTIVEMQ_CPP_APR_LIB_RELEASE _ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libapr-1.lib") - _set_exists(ACTIVEMQ_CPP_APR_DLL_RELEASE _ACTIVEMQ_CPP_APR_DLL_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libapr-1.dll") + _set_exists(ACTIVEMQ_CPP_APR_DLL_RELEASE _ACTIVEMQ_CPP_APR_DLL_RELEASE_MISSING "${_IMPORT_PREFIX}/bin/libapr-1.dll") _set_exists(ACTIVEMQ_CPP_APR_LIB_DEBUG _ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libapr-1.lib") - _set_exists(ACTIVEMQ_CPP_APR_DLL_DEBUG _ACTIVEMQ_CPP_APR_DLL_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libapr-1.dll") + _set_exists(ACTIVEMQ_CPP_APR_DLL_DEBUG _ACTIVEMQ_CPP_APR_DLL_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/bin/libapr-1.dll") if (ACTIVEMQ_CPP_APR_LIB_RELEASE AND ACTIVEMQ_CPP_APR_DLL_RELEASE AND ACTIVEMQ_CPP_APR_LIB_DEBUG AND ACTIVEMQ_CPP_APR_DLL_DEBUG) _activemq_cpp_windows_dependencies() if (${CMAKE_FIND_PACKAGE_NAME}_WINDOWS_DEPENDENCIES_FOUND) diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json index 54ed5e65c4..9c30eca47c 100644 --- a/ports/activemq-cpp/vcpkg.json +++ b/ports/activemq-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "activemq-cpp", "version-semver": "3.9.5", - "port-version": 12, + "port-version": 13, "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.", "license": "Apache-2.0", "supports": "!(uwp | osx)", diff --git a/versions/a-/activemq-cpp.json b/versions/a-/activemq-cpp.json index 8323b6cd77..27d32b9f1f 100644 --- a/versions/a-/activemq-cpp.json +++ b/versions/a-/activemq-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75c1e838f461bba7a78802919b2ec16bdbfd154e", + "version-semver": "3.9.5", + "port-version": 13 + }, { "git-tree": "d8cbff606d12daa3bf08a8fa623c2d524f1e05e5", "version-semver": "3.9.5", diff --git a/versions/baseline.json b/versions/baseline.json index 3589c96c3f..c2487a326f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -34,7 +34,7 @@ }, "activemq-cpp": { "baseline": "3.9.5", - "port-version": 12 + "port-version": 13 }, "ada-url": { "baseline": "2.4.2",