diff --git a/CMakeLists.txt b/CMakeLists.txt index 01f751da5..d23845a1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,8 +18,8 @@ set (BUILD_SDF ON CACHE INTERNAL "Build SDF" FORCE) ################################################# # Find ign-cmake -find_package(ignition-cmake3 REQUIRED) -set(IGN_CMAKE_VER ${ignition-cmake3_VERSION_MAJOR}) +find_package(gz-cmake3 REQUIRED) +set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR}) ######################################## # Python interfaces vars @@ -109,20 +109,20 @@ if (BUILD_SDF) endif() ######################################## - # Find ignition math + # Find gz math # Set a variable for generating ProjectConfig.cmake - gz_find_package(ignition-math7 VERSION REQUIRED) - set(IGN_MATH_VER ${ignition-math7_VERSION_MAJOR}) + gz_find_package(gz-math7 VERSION REQUIRED) + set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR}) ######################################## - # Find ignition utils - gz_find_package(ignition-utils2 REQUIRED COMPONENTS cli) - set(IGN_UTILS_VER ${ignition-utils2_VERSION_MAJOR}) + # Find gz utils + gz_find_package(gz-utils2 REQUIRED COMPONENTS cli) + set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR}) ######################################## - # Find ignition common - gz_find_package(ignition-common5 COMPONENTS graphics REQUIRED_BY usd) - set(IGN_COMMON_VER ${ignition-common5_VERSION_MAJOR}) + # Find gz common + gz_find_package(gz-common5 COMPONENTS graphics REQUIRED_BY usd) + set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR}) ######################################## # Python interfaces diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 585754ed0..44d1593de 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -92,7 +92,7 @@ if (BUILD_TESTING) target_link_libraries(sdformattest PRIVATE ${PROJECT_LIBRARY_TARGET_NAME} - ignition-utils${IGN_UTILS_VER}::ignition-utils${IGN_UTILS_VER} + gz-utils${GZ_UTILS_VER}::gz-utils${GZ_UTILS_VER} ) set(python_tests diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9e3a2de68..efa0464bf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -110,8 +110,8 @@ gz_create_core_library(SOURCES ${sources} target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} PUBLIC - ignition-math${IGN_MATH_VER}::ignition-math${IGN_MATH_VER} - ignition-utils${IGN_UTILS_VER}::ignition-utils${IGN_UTILS_VER} + gz-math${GZ_MATH_VER}::gz-math${GZ_MATH_VER} + gz-utils${GZ_UTILS_VER}::gz-utils${GZ_UTILS_VER} PRIVATE TINYXML2::TINYXML2 using_parser_urdf) diff --git a/usd/src/CMakeLists.txt b/usd/src/CMakeLists.txt index a2d66c9ae..d31ae2a56 100644 --- a/usd/src/CMakeLists.txt +++ b/usd/src/CMakeLists.txt @@ -35,8 +35,8 @@ target_include_directories(${usd_target} target_link_libraries(${usd_target} PUBLIC - ignition-common${IGN_COMMON_VER}::ignition-common${IGN_COMMON_VER} - ignition-common${IGN_COMMON_VER}::graphics + gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER} + gz-common${GZ_COMMON_VER}::graphics ${PXR_LIBRARIES} ) diff --git a/usd/src/cmd/CMakeLists.txt b/usd/src/cmd/CMakeLists.txt index 9b03d0671..5ff73cc5b 100644 --- a/usd/src/cmd/CMakeLists.txt +++ b/usd/src/cmd/CMakeLists.txt @@ -15,8 +15,8 @@ if(TARGET ${usd_target}) target_link_libraries(sdf2usd PUBLIC - ignition-utils${IGN_UTILS_VER}::ignition-utils${IGN_UTILS_VER} - ignition-utils${IGN_UTILS_VER}::cli + gz-utils${GZ_UTILS_VER}::gz-utils${GZ_UTILS_VER} + gz-utils${GZ_UTILS_VER}::cli ${usd_target} ) @@ -26,8 +26,8 @@ if(TARGET ${usd_target}) target_link_libraries(usd2sdf PUBLIC - ignition-utils${IGN_UTILS_VER}::ignition-utils${IGN_UTILS_VER} - ignition-utils${IGN_UTILS_VER}::cli + gz-utils${GZ_UTILS_VER}::gz-utils${GZ_UTILS_VER} + gz-utils${GZ_UTILS_VER}::cli ${usd_target} )