Merge branch 'main' into ci_matching_branch/ticktock_find_ign_cmake

gazebosim · Jul 11, 2022 · c542aa9 · c542aa9
2 parents 6dcdba3 + 6a507fb
commit c542aa9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -84,7 +84,7 @@ gz_find_package(DART
 
 #--------------------------------------
 # Find bullet for the bullet plugin wrapper
-gz_find_package(IgnBullet
+gz_find_package(GzBullet
   VERSION 2.87
   REQUIRED_BY bullet
   PKGCONFIG bullet

diff --git a/bullet/CMakeLists.txt b/bullet/CMakeLists.txt
@@ -5,7 +5,7 @@ gz_add_component(bullet INTERFACE
   GET_TARGET_NAME features)
 
 link_directories(${BULLET_LIBRARY_DIRS})
-target_link_libraries(${features} INTERFACE IgnBullet::IgnBullet)
+target_link_libraries(${features} INTERFACE GzBullet::GzBullet)
 
 gz_get_libsources_and_unittests(sources test_sources)