Răsfoiți Sursa

Adding the sdformat13 3rdParty library as a dependency the `ROS2.Editor.Static` TARGET.

Signed-off-by: lumberyard-employee-dm <[email protected]>
lumberyard-employee-dm 2 ani în urmă
părinte
comite
d0df7e9b66

+ 3 - 2
Gems/ROS2/Code/CMakeLists.txt

@@ -37,7 +37,7 @@ endif()
 
 # Add a custom target to always check during build if sourced and cached distributions match.
 add_custom_target(
-    ROS2DistributionCheck ALL 
+    ROS2DistributionCheck ALL
     COMMENT "Checking if sourced ROS 2 distribution matches with the configuration"
     COMMAND ${CMAKE_COMMAND} -DROS_DISTRO=${ROS_DISTRO} -P ${CMAKE_CURRENT_SOURCE_DIR}/checkROS2Distribution.cmake
 )
@@ -136,7 +136,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
                 Gem::${gem_name}.Static
             PRIVATE
                 AZ::AssetBuilderSDK
-        )
+                3rdParty::sdformat
+    )
 
     find_package(urdfdom)
     target_link_libraries(${gem_name}.Editor.Static PUBLIC urdfdom::urdfdom_model)

+ 10 - 0
Gems/ROS2/Code/Platform/Linux/PAL_linux.cmake

@@ -7,3 +7,13 @@
 #
 
 set(PAL_TRAIT_BUILD_ROS2_GEM_SUPPORTED TRUE)
+
+if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+    ly_associate_package(PACKAGE_NAME sdformat-13.5.0-rev0-linux
+        TARGETS sdformat
+        PACKAGE_HASH 407a335c1fefc134e89b2dc2d1ffd6a47ea33546e77df4aaabf3edf8b3402ecb)
+elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
+    ly_associate_package(PACKAGE_NAME sdformat-13.5.0-rev0-linux-aarch64
+        TARGETS sdformat
+        PACKAGE_HASH a23977b262d6d80a5e1b22c24db27d25fe827c982296766c0f04ebf77ad0a217)
+endif()