From 3b40336ea6f66d506c68781c8d47947fe589d609 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Sat, 25 Jun 2022 17:05:38 -0700 Subject: [PATCH] Migrate IGNITION- CMake variables Signed-off-by: methylDragon --- CMakeLists.txt | 4 ++-- examples/actor_animation/CMakeLists.txt | 2 +- examples/camera_tracking/CMakeLists.txt | 2 +- examples/custom_scene_viewer/CMakeLists.txt | 2 +- examples/custom_shaders/CMakeLists.txt | 2 +- examples/custom_shaders_uniforms/CMakeLists.txt | 2 +- examples/depth_camera/CMakeLists.txt | 2 +- examples/gazebo_scene_viewer/CMakeLists.txt | 4 ++-- examples/heightmap/CMakeLists.txt | 2 +- examples/lidar_visual/CMakeLists.txt | 2 +- examples/mesh_viewer/CMakeLists.txt | 2 +- examples/mouse_picking/CMakeLists.txt | 2 +- examples/ogre2_demo/CMakeLists.txt | 2 +- examples/particles_demo/CMakeLists.txt | 2 +- examples/render_pass/CMakeLists.txt | 2 +- examples/segmentation_camera/CMakeLists.txt | 2 +- examples/simple_demo/CMakeLists.txt | 2 +- examples/simple_demo_qml/CMakeLists.txt | 4 ++-- examples/text_geom/CMakeLists.txt | 2 +- examples/thermal_camera/CMakeLists.txt | 2 +- examples/transform_control/CMakeLists.txt | 2 +- examples/view_control/CMakeLists.txt | 2 +- examples/visualization_demo/CMakeLists.txt | 2 +- examples/waves/CMakeLists.txt | 2 +- examples/wide_angle_camera/CMakeLists.txt | 2 +- 25 files changed, 28 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 711af703f..41174aec0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -199,8 +199,8 @@ gz_create_docs( TUTORIALS_MAINPAGE_MD "${CMAKE_BINARY_DIR}/tutorials.md" IMAGE_PATH_DIRS "${CMAKE_SOURCE_DIR}/tutorials/img" TAGFILES - "${IGNITION-COMMON_DOXYGEN_TAGFILE} = ${IGNITION-COMMON_API_URL}" - "${IGNITION-MATH_DOXYGEN_TAGFILE} = ${IGNITION-MATH_API_URL}" + "${GZ-COMMON_DOXYGEN_TAGFILE} = ${GZ-COMMON_API_URL}" + "${GZ-MATH_DOXYGEN_TAGFILE} = ${GZ-MATH_API_URL}" ) file(COPY ${CMAKE_SOURCE_DIR}/tutorials/img/ DESTINATION ${CMAKE_BINARY_DIR}/doxygen/html/img/) diff --git a/examples/actor_animation/CMakeLists.txt b/examples/actor_animation/CMakeLists.txt index 5dcf7e25e..65273b4ae 100644 --- a/examples/actor_animation/CMakeLists.txt +++ b/examples/actor_animation/CMakeLists.txt @@ -30,7 +30,7 @@ target_link_libraries(actor_animation ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ) add_custom_command(TARGET actor_animation POST_BUILD diff --git a/examples/camera_tracking/CMakeLists.txt b/examples/camera_tracking/CMakeLists.txt index 3f60a507b..d7837fdb4 100644 --- a/examples/camera_tracking/CMakeLists.txt +++ b/examples/camera_tracking/CMakeLists.txt @@ -24,5 +24,5 @@ target_link_libraries(camera_tracking ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ) diff --git a/examples/custom_scene_viewer/CMakeLists.txt b/examples/custom_scene_viewer/CMakeLists.txt index b2e6c634f..ad3ef8b4d 100644 --- a/examples/custom_scene_viewer/CMakeLists.txt +++ b/examples/custom_scene_viewer/CMakeLists.txt @@ -38,7 +38,7 @@ target_link_libraries(custom_scene_viewer ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ) add_custom_command(TARGET custom_scene_viewer POST_BUILD diff --git a/examples/custom_shaders/CMakeLists.txt b/examples/custom_shaders/CMakeLists.txt index f37a9ed07..5caa55c67 100644 --- a/examples/custom_shaders/CMakeLists.txt +++ b/examples/custom_shaders/CMakeLists.txt @@ -34,7 +34,7 @@ target_link_libraries(custom_shaders ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ) add_custom_command(TARGET custom_shaders POST_BUILD diff --git a/examples/custom_shaders_uniforms/CMakeLists.txt b/examples/custom_shaders_uniforms/CMakeLists.txt index 7076dffde..d00c57d52 100644 --- a/examples/custom_shaders_uniforms/CMakeLists.txt +++ b/examples/custom_shaders_uniforms/CMakeLists.txt @@ -50,7 +50,7 @@ endif() add_executable(custom_shaders_uniforms Main.cc GlutWindow.cc) target_link_libraries(custom_shaders_uniforms - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ${TARGET_THIRD_PARTY_DEPENDS} ) diff --git a/examples/depth_camera/CMakeLists.txt b/examples/depth_camera/CMakeLists.txt index 698df998c..3df420355 100644 --- a/examples/depth_camera/CMakeLists.txt +++ b/examples/depth_camera/CMakeLists.txt @@ -30,7 +30,7 @@ target_link_libraries(depth_camera ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ) add_custom_command(TARGET depth_camera POST_BUILD diff --git a/examples/gazebo_scene_viewer/CMakeLists.txt b/examples/gazebo_scene_viewer/CMakeLists.txt index 3db7d9f63..93a72b3c6 100644 --- a/examples/gazebo_scene_viewer/CMakeLists.txt +++ b/examples/gazebo_scene_viewer/CMakeLists.txt @@ -33,7 +33,7 @@ target_link_libraries(gazebo_scene_viewer ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} ${GAZEBO_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ${STD_CXX_FS_LIBRARIES} ) @@ -48,6 +48,6 @@ target_link_libraries(gazebo_scene_viewer2_demo ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} ${GAZEBO_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ${STD_CXX_FS_LIBRARIES} ) diff --git a/examples/heightmap/CMakeLists.txt b/examples/heightmap/CMakeLists.txt index 3e1557e8e..685621dc3 100644 --- a/examples/heightmap/CMakeLists.txt +++ b/examples/heightmap/CMakeLists.txt @@ -30,7 +30,7 @@ target_link_libraries(heightmap ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ) add_custom_command(TARGET heightmap POST_BUILD diff --git a/examples/lidar_visual/CMakeLists.txt b/examples/lidar_visual/CMakeLists.txt index dac1a87c7..d3fc88d56 100644 --- a/examples/lidar_visual/CMakeLists.txt +++ b/examples/lidar_visual/CMakeLists.txt @@ -30,5 +30,5 @@ target_link_libraries(lidar_visual ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ) \ No newline at end of file diff --git a/examples/mesh_viewer/CMakeLists.txt b/examples/mesh_viewer/CMakeLists.txt index 21da04bd1..b73adb4c0 100644 --- a/examples/mesh_viewer/CMakeLists.txt +++ b/examples/mesh_viewer/CMakeLists.txt @@ -30,7 +30,7 @@ target_link_libraries(mesh_viewer ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ) add_custom_command(TARGET mesh_viewer POST_BUILD diff --git a/examples/mouse_picking/CMakeLists.txt b/examples/mouse_picking/CMakeLists.txt index 4afa0b81f..7b21a0ee7 100644 --- a/examples/mouse_picking/CMakeLists.txt +++ b/examples/mouse_picking/CMakeLists.txt @@ -28,5 +28,5 @@ target_link_libraries(mouse_picking ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ) diff --git a/examples/ogre2_demo/CMakeLists.txt b/examples/ogre2_demo/CMakeLists.txt index 6f1f5e13e..fb229d56e 100644 --- a/examples/ogre2_demo/CMakeLists.txt +++ b/examples/ogre2_demo/CMakeLists.txt @@ -36,7 +36,7 @@ target_link_libraries(ogre2_demo ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ) add_custom_command(TARGET ogre2_demo POST_BUILD diff --git a/examples/particles_demo/CMakeLists.txt b/examples/particles_demo/CMakeLists.txt index 209c458c8..65186e939 100644 --- a/examples/particles_demo/CMakeLists.txt +++ b/examples/particles_demo/CMakeLists.txt @@ -30,7 +30,7 @@ target_link_libraries(particles_demo ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ) add_custom_command(TARGET particles_demo POST_BUILD diff --git a/examples/render_pass/CMakeLists.txt b/examples/render_pass/CMakeLists.txt index a4caf1a44..70b693a6e 100644 --- a/examples/render_pass/CMakeLists.txt +++ b/examples/render_pass/CMakeLists.txt @@ -25,5 +25,5 @@ target_link_libraries(render_pass ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ) diff --git a/examples/segmentation_camera/CMakeLists.txt b/examples/segmentation_camera/CMakeLists.txt index 0dc1c5bbb..177e6ad3d 100644 --- a/examples/segmentation_camera/CMakeLists.txt +++ b/examples/segmentation_camera/CMakeLists.txt @@ -30,7 +30,7 @@ target_link_libraries(segmentation_camera ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ) add_custom_command(TARGET segmentation_camera POST_BUILD diff --git a/examples/simple_demo/CMakeLists.txt b/examples/simple_demo/CMakeLists.txt index 76ac1cd71..86e0a0f81 100644 --- a/examples/simple_demo/CMakeLists.txt +++ b/examples/simple_demo/CMakeLists.txt @@ -25,5 +25,5 @@ target_link_libraries(simple_demo ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ) diff --git a/examples/simple_demo_qml/CMakeLists.txt b/examples/simple_demo_qml/CMakeLists.txt index 434ee1f84..a59a11f25 100644 --- a/examples/simple_demo_qml/CMakeLists.txt +++ b/examples/simple_demo_qml/CMakeLists.txt @@ -67,13 +67,13 @@ add_executable(simple_demo_qml ) target_include_directories(simple_demo_qml PUBLIC - ${IGNITION-RENDERING_INCLUDE_DIRS} + ${GZ-RENDERING_INCLUDE_DIRS} ${OGRE2_INCLUDE_DIRS} ${OpenGL_INCLUDE_DIRS} ) target_link_libraries(simple_demo_qml PUBLIC - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ${OGRE2_LIBRARIES} ${OPENGL_LIBRARIES} Qt5::Core diff --git a/examples/text_geom/CMakeLists.txt b/examples/text_geom/CMakeLists.txt index fe110f095..0e07f7558 100644 --- a/examples/text_geom/CMakeLists.txt +++ b/examples/text_geom/CMakeLists.txt @@ -25,6 +25,6 @@ target_link_libraries(text_geom ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ) diff --git a/examples/thermal_camera/CMakeLists.txt b/examples/thermal_camera/CMakeLists.txt index e04567343..1727390d4 100644 --- a/examples/thermal_camera/CMakeLists.txt +++ b/examples/thermal_camera/CMakeLists.txt @@ -30,7 +30,7 @@ target_link_libraries(thermal_camera ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ) add_custom_command(TARGET thermal_camera POST_BUILD diff --git a/examples/transform_control/CMakeLists.txt b/examples/transform_control/CMakeLists.txt index ef379fc95..6f895d46c 100644 --- a/examples/transform_control/CMakeLists.txt +++ b/examples/transform_control/CMakeLists.txt @@ -28,5 +28,5 @@ target_link_libraries(transform_control ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ) diff --git a/examples/view_control/CMakeLists.txt b/examples/view_control/CMakeLists.txt index 1e7687cbb..e06301cf1 100644 --- a/examples/view_control/CMakeLists.txt +++ b/examples/view_control/CMakeLists.txt @@ -24,5 +24,5 @@ target_link_libraries(view_control ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ) diff --git a/examples/visualization_demo/CMakeLists.txt b/examples/visualization_demo/CMakeLists.txt index 8cf703d3b..3d89d4758 100644 --- a/examples/visualization_demo/CMakeLists.txt +++ b/examples/visualization_demo/CMakeLists.txt @@ -43,6 +43,6 @@ endif() add_executable(visualization_demo Main.cc GlutWindow.cc) target_link_libraries(visualization_demo - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ${TARGET_THIRD_PARTY_DEPENDS} ) diff --git a/examples/waves/CMakeLists.txt b/examples/waves/CMakeLists.txt index dc44d8e11..81a3237b5 100644 --- a/examples/waves/CMakeLists.txt +++ b/examples/waves/CMakeLists.txt @@ -50,7 +50,7 @@ endif() add_executable(waves Main.cc GlutWindow.cc) target_link_libraries(waves - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ${TARGET_THIRD_PARTY_DEPENDS} ) diff --git a/examples/wide_angle_camera/CMakeLists.txt b/examples/wide_angle_camera/CMakeLists.txt index 55c2bba1a..bbc20fcf7 100644 --- a/examples/wide_angle_camera/CMakeLists.txt +++ b/examples/wide_angle_camera/CMakeLists.txt @@ -42,7 +42,7 @@ endif() add_executable(wide_angle_camera Main.cc GlutWindow.cc) target_link_libraries(wide_angle_camera - ${IGNITION-RENDERING_LIBRARIES} + ${GZ-RENDERING_LIBRARIES} ${TARGET_THIRD_PARTY_DEPENDS} )