diff --git a/ports/backward-cpp/include-dir.diff b/ports/backward-cpp/include-dir.diff new file mode 100644 index 0000000000..9a502744b2 --- /dev/null +++ b/ports/backward-cpp/include-dir.diff @@ -0,0 +1,16 @@ +diff --git a/BackwardConfig.cmake b/BackwardConfig.cmake +index a982adc..0c549f3 100644 +--- a/BackwardConfig.cmake ++++ b/BackwardConfig.cmake +@@ -198,6 +198,11 @@ if(WIN32) + endif() + + set(BACKWARD_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}") ++if(NOT PROJECT_NAME STREQUAL "backward") ++ get_filename_component(BACKWARD_INCLUDE_DIR "${BACKWARD_INCLUDE_DIR}" DIRECTORY) ++ get_filename_component(BACKWARD_INCLUDE_DIR "${BACKWARD_INCLUDE_DIR}" DIRECTORY) ++ set(BACKWARD_INCLUDE_DIR "${BACKWARD_INCLUDE_DIR}/include") ++endif() + + set(BACKWARD_HAS_EXTERNAL_LIBRARIES FALSE) + set(FIND_PACKAGE_REQUIRED_VARS BACKWARD_INCLUDE_DIR) diff --git a/ports/backward-cpp/portfile.cmake b/ports/backward-cpp/portfile.cmake index 3860f5225b..65725bea26 100644 --- a/ports/backward-cpp/portfile.cmake +++ b/ports/backward-cpp/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 db0256a54819952ff1d92e05d6ab81fe979d4826ebb6651b6b08c30e7a0091879dfeff33d81f9599462152ce68e61e2c8c42bf039129bc6b28d1e68b1eab039b HEAD_REF master + PATCHES + include-dir.diff ) set(VCPKG_BUILD_TYPE release) # header-only @@ -12,7 +14,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME Backward CONFIG_PATH lib/backward) +vcpkg_cmake_config_fixup(PACKAGE_NAME backward CONFIG_PATH lib/backward) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") diff --git a/ports/backward-cpp/vcpkg.json b/ports/backward-cpp/vcpkg.json index 08e84ce350..f1b7db835c 100644 --- a/ports/backward-cpp/vcpkg.json +++ b/ports/backward-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "backward-cpp", "version": "1.6", + "port-version": 1, "description": "A beautiful stack trace pretty printer for C++", "homepage": "https://github.com/bombela/backward-cpp", "supports": "!uwp & !(windows & arm)", diff --git a/ports/ignition-tools/portfile.cmake b/ports/ignition-tools/portfile.cmake index 58e821cb31..db69f40b45 100644 --- a/ports/ignition-tools/portfile.cmake +++ b/ports/ignition-tools/portfile.cmake @@ -12,6 +12,8 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON + -DUSE_SYSTEM_BACKWARDCPP=ON ) vcpkg_cmake_install() diff --git a/ports/ignition-tools/vcpkg.json b/ports/ignition-tools/vcpkg.json index 3d0704e3ee..b1c3d742fa 100644 --- a/ports/ignition-tools/vcpkg.json +++ b/ports/ignition-tools/vcpkg.json @@ -1,11 +1,13 @@ { "name": "ignition-tools", "version": "1.5.0", + "port-version": 1, "description": "Gazebo tools provide the ign command line tool that accepts multiple subcommands.", "homepage": "https://gazebosim.org", "license": "Apache-2.0", "supports": "!(arm & windows) & !uwp", "dependencies": [ + "backward-cpp", { "name": "vcpkg-cmake", "host": true diff --git a/versions/b-/backward-cpp.json b/versions/b-/backward-cpp.json index 0311ef5cbc..56900b9b5d 100644 --- a/versions/b-/backward-cpp.json +++ b/versions/b-/backward-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "748c91a2ed90cad10b92d4c527dc855ec8f15db0", + "version": "1.6", + "port-version": 1 + }, { "git-tree": "9f204819a5063dea81b56369e5ce424219e56ca5", "version": "1.6", diff --git a/versions/baseline.json b/versions/baseline.json index 27ef9b8812..83fce228b4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -470,7 +470,7 @@ }, "backward-cpp": { "baseline": "1.6", - "port-version": 0 + "port-version": 1 }, "basisu": { "baseline": "1.11", @@ -3202,7 +3202,7 @@ }, "ignition-tools": { "baseline": "1.5.0", - "port-version": 0 + "port-version": 1 }, "ignition-transport4": { "baseline": "4.0.0", diff --git a/versions/i-/ignition-tools.json b/versions/i-/ignition-tools.json index 27201bf426..8e3a024b41 100644 --- a/versions/i-/ignition-tools.json +++ b/versions/i-/ignition-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b47d5830dfaf7b6f136f5b26002b50adb0804bde", + "version": "1.5.0", + "port-version": 1 + }, { "git-tree": "5567f256c2183bacba71d78d26362a1b76021bcf", "version": "1.5.0",