diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 2e25a22e8d..2bd0eb8d24 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -335,7 +335,7 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) if("xml" IN_LIST FEATURES) vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} "debug=1" "optimize=0" "-j${VCPKG_CONCURRENCY}" - WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" + WORKING_DIRECTORY "${WORKING_DIR}/../ACEXML" LOGNAME make-xml-${TARGET_TRIPLET}-dbg ) endif() @@ -349,7 +349,7 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) if("xml" IN_LIST FEATURES) vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} install - WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" + WORKING_DIRECTORY "${WORKING_DIR}/../ACEXML" LOGNAME install-xml-${TARGET_TRIPLET}-dbg ) endif() @@ -372,7 +372,7 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) if("xml" IN_LIST FEATURES) vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} realclean - WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" + WORKING_DIRECTORY "${WORKING_DIR}/../ACEXML" LOGNAME realclean-xml-${TARGET_TRIPLET}-dbg ) endif() @@ -386,7 +386,7 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) if("xml" IN_LIST FEATURES) vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} "-j${VCPKG_CONCURRENCY}" - WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" + WORKING_DIRECTORY "${WORKING_DIR}/../ACEXML" LOGNAME make-xml-${TARGET_TRIPLET}-rel ) endif() @@ -400,7 +400,7 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) if("xml" IN_LIST FEATURES) vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} install - WORKING_DIRECTORY "${WORKING_DIR}/ACEXML" + WORKING_DIRECTORY "${WORKING_DIR}/../ACEXML" LOGNAME install-xml-${TARGET_TRIPLET}-rel ) endif() diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json index b4597faced..b193028075 100644 --- a/ports/ace/vcpkg.json +++ b/ports/ace/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ace", "version": "7.0.10", + "port-version": 1, "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 b2850e7001..e673970859 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8bdeb0d1434ffdf14bad59ba83c46175ca86c269", + "version": "7.0.10", + "port-version": 1 + }, { "git-tree": "071572f946d1073390824598caf6484b6a0fdcbf", "version": "7.0.10", diff --git a/versions/baseline.json b/versions/baseline.json index ddf128c9c3..c98e40fec1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -22,7 +22,7 @@ }, "ace": { "baseline": "7.0.10", - "port-version": 0 + "port-version": 1 }, "activemq-cpp": { "baseline": "3.9.5",