From 58070b6805f9e7ec15338cd0c5734a1bba14ac18 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 30 Dec 2022 08:53:07 +0100 Subject: [PATCH] [ace] no absolute paths (#28621) --- ports/ace/portfile.cmake | 1 + ports/ace/vcpkg.json | 2 +- versions/a-/ace.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 981d9e2440..489ad61fbd 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -417,6 +417,7 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/ace/bin/MakeProjectCreator") file(REMOVE "${CURRENT_PACKAGES_DIR}/share/ace/ace-devel.sh") + file(REMOVE "${CURRENT_PACKAGES_DIR}/share/tao/tao-devel.sh") endif() vcpkg_fixup_pkgconfig() diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json index 5980c3c9e5..62f28842ef 100644 --- a/ports/ace/vcpkg.json +++ b/ports/ace/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ace", "version": "7.0.11", - "port-version": 1, + "port-version": 2, "maintainers": "Johnny Willemsen ", "description": "The ADAPTIVE Communication Environment", "homepage": "https://github.com/DOCGroup/ACE_TAO", diff --git a/versions/a-/ace.json b/versions/a-/ace.json index f43ad79e2a..845a7ece6d 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "25ea14090fceba8ae684e0c6ab047a719250ef56", + "version": "7.0.11", + "port-version": 2 + }, { "git-tree": "055cdc76b023b781dec64b9b93bbeb8e807c9fda", "version": "7.0.11", diff --git a/versions/baseline.json b/versions/baseline.json index 83c726846d..d3319ed50b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -22,7 +22,7 @@ }, "ace": { "baseline": "7.0.11", - "port-version": 1 + "port-version": 2 }, "activemq-cpp": { "baseline": "3.9.5",