diff --git a/ports/gz-cmake4/portfile.cmake b/ports/gz-cmake4/portfile.cmake index 2a978d695494e4..c9551336d3fdba 100644 --- a/ports/gz-cmake4/portfile.cmake +++ b/ports/gz-cmake4/portfile.cmake @@ -9,5 +9,5 @@ ignition_modular_library( dependencies.patch ) -file(COPY "${CURRENT_PORT_DIR}/vcpkg" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cmake/gz-cmake3/cmake3") +file(COPY "${CURRENT_PORT_DIR}/vcpkg" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cmake/${PORT}/cmake4") configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/gz-common6/vcpkg.json b/ports/gz-common6/vcpkg.json index 00f121d8eb4873..2cf1ae01037159 100644 --- a/ports/gz-common6/vcpkg.json +++ b/ports/gz-common6/vcpkg.json @@ -4,6 +4,7 @@ "description": "Common libraries for robotics applications", "homepage": "https://ignitionrobotics.org/libs/common", "license": "Apache-2.0", + "supports": "!linux & !osx", "dependencies": [ "assimp", { diff --git a/ports/gz-fuel-tools10/portfile.cmake b/ports/gz-fuel-tools10/portfile.cmake index c9aac8c2092adb..6403570d91f93f 100644 --- a/ports/gz-fuel-tools10/portfile.cmake +++ b/ports/gz-fuel-tools10/portfile.cmake @@ -1,5 +1,9 @@ set(PACKAGE_NAME fuel-tools) +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + ignition_modular_library( NAME ${PACKAGE_NAME} REF ${PORT}_${VERSION} diff --git a/ports/gz-gui9/portfile.cmake b/ports/gz-gui9/portfile.cmake index b3ce69fff7452b..fe99e41700b94a 100644 --- a/ports/gz-gui9/portfile.cmake +++ b/ports/gz-gui9/portfile.cmake @@ -1,5 +1,9 @@ set(PACKAGE_NAME gui) +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + ignition_modular_library( NAME ${PACKAGE_NAME} REF ${PORT}_${VERSION} diff --git a/ports/gz-gui9/vcpkg.json b/ports/gz-gui9/vcpkg.json index 520ef84288cefa..9319e0a71e80bf 100644 --- a/ports/gz-gui9/vcpkg.json +++ b/ports/gz-gui9/vcpkg.json @@ -4,6 +4,7 @@ "description": "Gazebo GUI builds on top of Qt to provide widgets which are useful when developing robotics applications, such as a 3D view, plots, dashboard, etc, and can be used together in a convenient unified interface.", "homepage": "https://gazebosim.org/libs/gui", "license": "Apache-2.0", + "supports": "!(windows & static & !staticcrt)", "dependencies": [ "gz-cmake4", "gz-common6", diff --git a/ports/gz-msgs11/portfile.cmake b/ports/gz-msgs11/portfile.cmake index e0284c2e28b67d..f3b17458f6ba59 100644 --- a/ports/gz-msgs11/portfile.cmake +++ b/ports/gz-msgs11/portfile.cmake @@ -6,8 +6,6 @@ vcpkg_add_to_path("${PYTHON3_DIR}") if(VCPKG_TARGET_IS_WINDOWS) set(BIGOBJ_OPTION "/bigobj") -else() - set(BIGOBJ_OPTION "-Wa,-mbig-obj") endif() ignition_modular_library( @@ -22,8 +20,12 @@ ignition_modular_library( move_bin_to_tools.patch ) -file(GLOB BIN_FILES "${CURRENT_PACKAGES_DIR}/bin/gz-msgs11_*") +file(GLOB BIN_FILES "${CURRENT_PACKAGES_DIR}/bin/${PORT}_*") file(INSTALL ${BIN_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") -file(GLOB BIN_FILES_TO_REMOVE "${CURRENT_PACKAGES_DIR}/bin/gz-msgs11_*" "${CURRENT_PACKAGES_DIR}/debug/bin/gz-msgs11_*") +file(GLOB BIN_FILES_TO_REMOVE "${CURRENT_PACKAGES_DIR}/bin/${PORT}_*" "${CURRENT_PACKAGES_DIR}/debug/bin/gz-msgs11_*") file(REMOVE ${BIN_FILES_TO_REMOVE}) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") +endif() diff --git a/ports/gz-rendering9/fix-dependencies.patch b/ports/gz-rendering9/fix-dependencies.patch index 221d2e9041f4ec..6bd8e154af71f6 100644 --- a/ports/gz-rendering9/fix-dependencies.patch +++ b/ports/gz-rendering9/fix-dependencies.patch @@ -35,10 +35,18 @@ index 96ce8913..4ef6b63c 100644 if (OGRE_FOUND) # find boost - mainly needed on macOS and also by the terrain component diff --git a/ogre2/src/terrain/Terra/CMakeLists.txt b/ogre2/src/terrain/Terra/CMakeLists.txt -index 3da28165..55e95d2f 100644 --- a/ogre2/src/terrain/Terra/CMakeLists.txt +++ b/ogre2/src/terrain/Terra/CMakeLists.txt -@@ -33,7 +33,9 @@ target_include_directories(${PROJECT_NAME} +@@ -1,6 +1,6 @@ + +-project(terra) ++project(terra9) + + file( GLOB_RECURSE TERRA_SOURCES + ${CMAKE_CURRENT_LIST_DIR}/include/*.h + ${CMAKE_CURRENT_LIST_DIR}/src/*.cpp +@@ -32,8 +32,10 @@ + # we must add this one manually for this to build correctly ${OGRE2_INCLUDE}/Hlms/Pbs ${OGRE2_INCLUDE}/Hlms/Common PUBLIC @@ -48,4 +56,18 @@ index 3da28165..55e95d2f 100644 ) target_link_libraries(${PROJECT_NAME} PRIVATE GzOGRE2::GzOGRE2) -+install(TARGETS ${PROJECT_NAME} EXPORT gz-rendering7-ogre2) ++install(TARGETS ${PROJECT_NAME} EXPORT gz-rendering9-ogre2) +diff --git a/ogre2/src/CMakeLists.txt b/ogre2/src/CMakeLists.txt +--- a/ogre2/src/CMakeLists.txt ++++ b/ogre2/src/CMakeLists.txt +@@ -58,9 +58,9 @@ + gz-math${GZ_MATH_VER}::eigen3 + PRIVATE + gz-plugin${GZ_PLUGIN_VER}::register + ${OPENGL_LIBRARIES} +- terra ++ terra9 + GzOGRE2::GzOGRE2) + + + if (TARGET OpenGL::EGL) diff --git a/ports/gz-sensors9/portfile.cmake b/ports/gz-sensors9/portfile.cmake index 3ae64f693d09fa..ddb79eab7a0385 100644 --- a/ports/gz-sensors9/portfile.cmake +++ b/ports/gz-sensors9/portfile.cmake @@ -1,5 +1,9 @@ set(PACKAGE_NAME sensors) +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + ignition_modular_library( NAME ${PACKAGE_NAME} REF ${PORT}_${VERSION} diff --git a/ports/gz-transport14/portfile.cmake b/ports/gz-transport14/portfile.cmake index 48ca303474bab3..26da235e479b51 100644 --- a/ports/gz-transport14/portfile.cmake +++ b/ports/gz-transport14/portfile.cmake @@ -1,5 +1,9 @@ set(PACKAGE_NAME transport) +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + ignition_modular_library( NAME ${PACKAGE_NAME} REF ${PORT}_${VERSION} diff --git a/ports/gz-utils3/vcpkg.json b/ports/gz-utils3/vcpkg.json index 3382dc6dad57b0..69340d26a16576 100644 --- a/ports/gz-utils3/vcpkg.json +++ b/ports/gz-utils3/vcpkg.json @@ -9,6 +9,7 @@ { "name": "ignition-modularscripts", "host": true - } + }, + "spdlog" ] } diff --git a/versions/g-/gz-cmake4.json b/versions/g-/gz-cmake4.json index 778386017e8382..efbacd458dba3e 100644 --- a/versions/g-/gz-cmake4.json +++ b/versions/g-/gz-cmake4.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "465b0168bd9f2b0148aeddf7b4c511d77da8b237", + "git-tree": "69bd71b1f6c0fb9587d055f77528d21fdbe2428f", "version": "4.1.0", "port-version": 0 } diff --git a/versions/g-/gz-common6.json b/versions/g-/gz-common6.json index 1f6c5ff326a171..124475470b4571 100644 --- a/versions/g-/gz-common6.json +++ b/versions/g-/gz-common6.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "36d0865172fff0804af32d619c931a58d8fdacf2", + "git-tree": "bfcf4b654dba31ac49feec7cdfdba0b8eff5767a", "version": "6.0.1", "port-version": 0 } diff --git a/versions/g-/gz-fuel-tools10.json b/versions/g-/gz-fuel-tools10.json index da9fdc350088be..b2c7533c315847 100644 --- a/versions/g-/gz-fuel-tools10.json +++ b/versions/g-/gz-fuel-tools10.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c3241038a19afdfa2ecc7b25cab1a43b0dcbd5a2", + "git-tree": "2b6f84168276316a6403a325c5a9a3c49e8b8003", "version": "10.0.0", "port-version": 0 } diff --git a/versions/g-/gz-gui9.json b/versions/g-/gz-gui9.json index beac67b29c1225..68141e55805a5e 100644 --- a/versions/g-/gz-gui9.json +++ b/versions/g-/gz-gui9.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6ed51e669cf58a3c5b9c69536485d1cf5220805b", + "git-tree": "81e50f7421591dd13126cb38b7ef6a6e757fe139", "version": "9.0.0", "port-version": 0 } diff --git a/versions/g-/gz-msgs11.json b/versions/g-/gz-msgs11.json index 6fefb8f478a7c2..cd34d791c17f48 100644 --- a/versions/g-/gz-msgs11.json +++ b/versions/g-/gz-msgs11.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "cc7faa5577fefb7859eb04bc2bd3efb2b606cbc2", + "git-tree": "b49941324991093a8a0e9225387e898bdb4b03a3", "version": "11.0.2", "port-version": 0 } diff --git a/versions/g-/gz-rendering9.json b/versions/g-/gz-rendering9.json index 2b4fbdf2e06ae9..f9436737ba80a1 100644 --- a/versions/g-/gz-rendering9.json +++ b/versions/g-/gz-rendering9.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "000e6d9427ce7097e5f2cca8f230621d325306e1", + "git-tree": "4f226be9fe1f14e80588516643cb18e69cff829d", "version": "9.0.0", "port-version": 0 } diff --git a/versions/g-/gz-sensors9.json b/versions/g-/gz-sensors9.json index f15b15e4249d8d..31e277d6186b47 100644 --- a/versions/g-/gz-sensors9.json +++ b/versions/g-/gz-sensors9.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5e0e3568fdcee777e0515b32cbcb3c2cd91c7309", + "git-tree": "5c227ec440b4039cf036cffb5adb132bfdec8884", "version": "9.0.0", "port-version": 0 } diff --git a/versions/g-/gz-transport14.json b/versions/g-/gz-transport14.json index 0500d729cb7c99..fc8f80519fc816 100644 --- a/versions/g-/gz-transport14.json +++ b/versions/g-/gz-transport14.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "789182bd6e25e4b48700083f5c22bd4164b27e21", + "git-tree": "ba1b72097f8bd9c516d4fab68116b45c27638ad5", "version": "14.0.0", "port-version": 0 } diff --git a/versions/g-/gz-utils3.json b/versions/g-/gz-utils3.json index c2264c8d46e8df..8fb01c45096122 100644 --- a/versions/g-/gz-utils3.json +++ b/versions/g-/gz-utils3.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "6dffad0a0932bc72a5a4604c3c55fe33ec8b7012", + "git-tree": "1a3b59bf36cc631d1ebf63c69aabb7911499afa6", "version": "3.1.0", "port-version": 0 }