Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate IGNITION- CMake variables #656

Merged
merged 1 commit into from
Jun 26, 2022
Merged

Migrate IGNITION- CMake variables #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
2 changes: 1 addition & 1 deletion examples/actor_animation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/camera_tracking/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ target_link_libraries(camera_tracking
${GLUT_LIBRARIES}
${OPENGL_LIBRARIES}
${GLEW_LIBRARIES}
${IGNITION-RENDERING_LIBRARIES}
${GZ-RENDERING_LIBRARIES}
)
2 changes: 1 addition & 1 deletion examples/custom_scene_viewer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_shaders/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_shaders_uniforms/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

Expand Down
2 changes: 1 addition & 1 deletion examples/depth_camera/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/gazebo_scene_viewer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

Expand All @@ -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}
)
2 changes: 1 addition & 1 deletion examples/heightmap/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/lidar_visual/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ target_link_libraries(lidar_visual
${GLUT_LIBRARIES}
${OPENGL_LIBRARIES}
${GLEW_LIBRARIES}
${IGNITION-RENDERING_LIBRARIES}
${GZ-RENDERING_LIBRARIES}
)
2 changes: 1 addition & 1 deletion examples/mesh_viewer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/mouse_picking/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ target_link_libraries(mouse_picking
${GLUT_LIBRARIES}
${OPENGL_LIBRARIES}
${GLEW_LIBRARIES}
${IGNITION-RENDERING_LIBRARIES}
${GZ-RENDERING_LIBRARIES}
)
2 changes: 1 addition & 1 deletion examples/ogre2_demo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/particles_demo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/render_pass/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ target_link_libraries(render_pass
${GLUT_LIBRARIES}
${OPENGL_LIBRARIES}
${GLEW_LIBRARIES}
${IGNITION-RENDERING_LIBRARIES}
${GZ-RENDERING_LIBRARIES}
)
2 changes: 1 addition & 1 deletion examples/segmentation_camera/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/simple_demo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ target_link_libraries(simple_demo
${GLUT_LIBRARIES}
${OPENGL_LIBRARIES}
${GLEW_LIBRARIES}
${IGNITION-RENDERING_LIBRARIES}
${GZ-RENDERING_LIBRARIES}
)
4 changes: 2 additions & 2 deletions examples/simple_demo_qml/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/text_geom/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ target_link_libraries(text_geom
${GLUT_LIBRARIES}
${OPENGL_LIBRARIES}
${GLEW_LIBRARIES}
${IGNITION-RENDERING_LIBRARIES}
${GZ-RENDERING_LIBRARIES}
)

2 changes: 1 addition & 1 deletion examples/thermal_camera/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/transform_control/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ target_link_libraries(transform_control
${GLUT_LIBRARIES}
${OPENGL_LIBRARIES}
${GLEW_LIBRARIES}
${IGNITION-RENDERING_LIBRARIES}
${GZ-RENDERING_LIBRARIES}
)
2 changes: 1 addition & 1 deletion examples/view_control/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ target_link_libraries(view_control
${GLUT_LIBRARIES}
${OPENGL_LIBRARIES}
${GLEW_LIBRARIES}
${IGNITION-RENDERING_LIBRARIES}
${GZ-RENDERING_LIBRARIES}
)
2 changes: 1 addition & 1 deletion examples/visualization_demo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)
2 changes: 1 addition & 1 deletion examples/waves/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

Expand Down
2 changes: 1 addition & 1 deletion examples/wide_angle_camera/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

Expand Down