diff --git a/ports/sdformat13/cmake-config.patch b/ports/sdformat13/cmake-config.patch index 92b00b08849754..34970b6dc6bd98 100644 --- a/ports/sdformat13/cmake-config.patch +++ b/ports/sdformat13/cmake-config.patch @@ -10,3 +10,14 @@ index 3465a8f..2b57440 100644 if (BUILD_TESTING) # Build this test file only if Gazebo Tools is installed. + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -58,6 +58,6 @@ + if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF) +- gz_find_package(GzURDFDOM VERSION 1.0 QUIET) ++ gz_find_package(GzURDFDOM) + if (NOT GzURDFDOM_FOUND) + if (NOT DEFINED USE_INTERNAL_URDF) + # fallback to internal urdf + set(USE_INTERNAL_URDF ON) diff --git a/ports/sdformat13/portfile.cmake b/ports/sdformat13/portfile.cmake index 5c250757d228b6..146dd44ec0df89 100644 --- a/ports/sdformat13/portfile.cmake +++ b/ports/sdformat13/portfile.cmake @@ -31,5 +31,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/sdformat13/usage b/ports/sdformat13/usage deleted file mode 100644 index 3a202505ca6904..00000000000000 --- a/ports/sdformat13/usage +++ /dev/null @@ -1,4 +0,0 @@ -sdformat13 provides CMake targets: - - find_package(sdformat13 CONFIG REQUIRED) - target_link_libraries(main PRIVATE sdformat13::sdformat13) diff --git a/ports/sdformat13/vcpkg.json b/ports/sdformat13/vcpkg.json index 534c4c0a44cdb9..440bb85124adcb 100644 --- a/ports/sdformat13/vcpkg.json +++ b/ports/sdformat13/vcpkg.json @@ -4,7 +4,7 @@ "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", "license": "Apache-2.0", - "supports": "!uwp & !windows", + "supports": "!uwp", "dependencies": [ "gz-math7", "gz-tools2", diff --git a/versions/s-/sdformat13.json b/versions/s-/sdformat13.json index f7483c75a213a2..ae3c3f2f9006f6 100644 --- a/versions/s-/sdformat13.json +++ b/versions/s-/sdformat13.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b005db07273efd4913f040594b791b89a4e0094a", + "git-tree": "b8f7d3bdbefa0795808f6c9a42764584d6e96f2c", "version": "13.5.0", "port-version": 0 }