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.

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

Rename CMake project to gz #645

Merged
merged 4 commits into from
Jun 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 17 additions & 17 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(ignition-rendering7 VERSION 7.0.0)
project(gz-rendering7 VERSION 7.0.0)

#============================================================================
# Find ignition-cmake
# Find gz-cmake
#============================================================================
# If you get an error at this line, you need to install ignition-cmake
find_package(ignition-cmake3 REQUIRED)
set(IGN_CMAKE_VER ${ignition-cmake3_VERSION_MAJOR})
# If you get an error at this line, you need to install gz-cmake
find_package(gz-cmake3 REQUIRED)
set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})

#============================================================================
# Set up the project
Expand All @@ -31,25 +31,25 @@ option(USE_UNOFFICIAL_OGRE_VERSIONS "Accept unsupported Ogre versions in the bui
#============================================================================

#--------------------------------------
# Find ignition-math
gz_find_package(ignition-math7 REQUIRED COMPONENTS eigen3)
set(IGN_MATH_VER ${ignition-math7_VERSION_MAJOR})
# Find gz-math
gz_find_package(gz-math7 REQUIRED COMPONENTS eigen3)
set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})

#--------------------------------------
# Find ignition-common
gz_find_package(ignition-common5 REQUIRED
# Find gz-common
gz_find_package(gz-common5 REQUIRED
COMPONENTS graphics events geospatial)
set(IGN_COMMON_VER ${ignition-common5_VERSION_MAJOR})
set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR})

#--------------------------------------
# Find ignition-plugin
gz_find_package(ignition-plugin2 REQUIRED COMPONENTS all)
set(IGN_PLUGIN_VER ${ignition-plugin2_VERSION_MAJOR})
# Find gz-plugin
gz_find_package(gz-plugin2 REQUIRED COMPONENTS all)
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})

#--------------------------------------
# Find ignition-utils
gz_find_package(ignition-utils2 REQUIRED)
set(IGN_UTILS_VER ${ignition-utils2_VERSION_MAJOR})
# Find gz-utils
gz_find_package(gz-utils2 REQUIRED)
set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR})

#--------------------------------------
# Find FreeImage
Expand Down
6 changes: 4 additions & 2 deletions Migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ release will remove the deprecated code.

### Deprecations

1. The CMake project is called `gz-renderingN` instead of `ignition-renderingN`.
1. The shared libraries have `gz` where there used to be `ignition`, i.e. `libgz-rendering-ogre.so`
1. **ogre2/include/ignition/rendering/ogre2/Ogre2RenderEngine.hh**
+ Deprecated: `Ogre2IgnHlmsSphericalClipMinDistance &HlmsCustomizations()`
+ Replacement: `Ogre2GzHlmsSphericalClipMinDistance &SphericalClipMinDistance()`
2. The `ignition` namespace is deprecated and will be removed in future versions. Use `gz` instead.
3. Header files under `ignition/...` are deprecated and will be removed in future versions.
1. The `ignition` namespace is deprecated and will be removed in future versions. Use `gz` instead.
1. Header files under `ignition/...` are deprecated and will be removed in future versions.
Use `gz/...` instead.
4. The environment variable `IGN_RENDERING_PLUGIN_PATH` is deprecated. Use `GZ_RENDERING_PLUGIN_PATH` instead.
5. The environment variable `IGN_RENDERING_RESOURCE_PATH` is deprecated. Use `GZ_RENDERING_RESOURCE_PATH` instead.
Expand Down
4 changes: 2 additions & 2 deletions examples/actor_animation/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-actor-animation)
find_package(ignition-rendering7 REQUIRED)
project(gz-rendering-actor-animation)
find_package(gz-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
4 changes: 2 additions & 2 deletions examples/camera_tracking/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-camera-tracking)
find_package(ignition-rendering7 REQUIRED)
project(gz-rendering-camera-tracking)
find_package(gz-rendering7 REQUIRED)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
Expand Down
4 changes: 2 additions & 2 deletions examples/custom_scene_viewer/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-custom-scene-viewer)
find_package(ignition-rendering7 REQUIRED)
project(gz-rendering-custom-scene-viewer)
find_package(gz-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
4 changes: 2 additions & 2 deletions examples/custom_shaders/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-custom-shaders)
project(gz-rendering-custom-shaders)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
)

find_package(ignition-rendering7 REQUIRED)
find_package(gz-rendering7 REQUIRED)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
Expand Down
4 changes: 2 additions & 2 deletions examples/custom_shaders_uniforms/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-custom_shaders_uniforms)
project(gz-rendering-custom_shaders_uniforms)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
)

find_package(ignition-rendering7)
find_package(gz-rendering7)

set(TARGET_THIRD_PARTY_DEPENDS "")

Expand Down
4 changes: 2 additions & 2 deletions examples/depth_camera/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-depth-camera)
find_package(ignition-rendering7 REQUIRED)
project(gz-rendering-depth-camera)
find_package(gz-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
4 changes: 2 additions & 2 deletions examples/gazebo_scene_viewer/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-gazebo-scene-viewer)
find_package(ignition-rendering7 REQUIRED)
project(gz-rendering-gazebo-scene-viewer)
find_package(gz-rendering7 REQUIRED)
find_package(gazebo REQUIRED)

include_directories(SYSTEM ${GAZEBO_INCLUDE_DIRS})
Expand Down
4 changes: 2 additions & 2 deletions examples/heightmap/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-heightmap)
find_package(ignition-rendering7 REQUIRED)
project(gz-rendering-heightmap)
find_package(gz-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
18 changes: 9 additions & 9 deletions examples/hello_world_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)

find_package(ignition-rendering7 REQUIRED)
set(IGN_RENDERING_VER ${ignition-rendering7_VERSION_MAJOR})
find_package(gz-rendering7 REQUIRED)
set(GZ_RENDERING_VER ${gz-rendering7_VERSION_MAJOR})

find_package(ignition-plugin2 REQUIRED COMPONENTS all)
set(IGN_PLUGIN_VER ${ignition-plugin2_VERSION_MAJOR})
find_package(gz-plugin2 REQUIRED COMPONENTS all)
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})

find_package(ignition-common5 REQUIRED)
set(IGN_COMMON_VER ${ignition-common5_VERSION_MAJOR})
find_package(gz-common5 REQUIRED)
set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR})

add_library(HelloWorldPlugin SHARED HelloWorldPlugin.cc)
target_link_libraries(HelloWorldPlugin
PUBLIC
ignition-rendering${IGN_RENDERING_VER}::ignition-rendering${IGN_RENDERING_VER}
ignition-common${IGN_COMMON_VER}::ignition-common${IGN_COMMON_VER}
gz-rendering${GZ_RENDERING_VER}::gz-rendering${GZ_RENDERING_VER}
gz-common${GZ_COMMON_VER}::gz-common${GZ_COMMON_VER}
PRIVATE
ignition-plugin${IGN_PLUGIN_VER}::register
gz-plugin${GZ_PLUGIN_VER}::register
)
4 changes: 2 additions & 2 deletions examples/lidar_visual/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-lidar_visual)
find_package(ignition-rendering7 REQUIRED)
project(gz-rendering-lidar_visual)
find_package(gz-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
4 changes: 2 additions & 2 deletions examples/mesh_viewer/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-mesh-viewer)
find_package(ignition-rendering7 REQUIRED)
project(gz-rendering-mesh-viewer)
find_package(gz-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
4 changes: 2 additions & 2 deletions examples/mouse_picking/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-mouse-picking)
find_package(ignition-rendering7 REQUIRED)
project(gz-rendering-mouse-picking)
find_package(gz-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
4 changes: 2 additions & 2 deletions examples/ogre2_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
project(ignition-rendering-ogre2-demo)
project(gz-rendering-ogre2-demo)

find_package(ignition-rendering7)
find_package(gz-rendering7)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
4 changes: 2 additions & 2 deletions examples/particles_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-particles-demo)
find_package(ignition-rendering7 REQUIRED)
project(gz-rendering-particles-demo)
find_package(gz-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
4 changes: 2 additions & 2 deletions examples/render_pass/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-render-pass)
project(gz-rendering-render-pass)

find_package(ignition-rendering7)
find_package(gz-rendering7)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
Expand Down
4 changes: 2 additions & 2 deletions examples/segmentation_camera/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-segmentation-camera)
find_package(ignition-rendering7 REQUIRED)
project(gz-rendering-segmentation-camera)
find_package(gz-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
4 changes: 2 additions & 2 deletions examples/simple_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-simple-demo)
project(gz-rendering-simple-demo)

find_package(ignition-rendering7)
find_package(gz-rendering7)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
Expand Down
10 changes: 5 additions & 5 deletions examples/simple_demo_qml/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-simple-demo-qml)
project(gz-rendering-simple-demo-qml)

#------------------------------------------------------------------------
# Compile as C++14
Expand All @@ -8,13 +8,13 @@ set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

#------------------------------------------------------------------------
# Find ignition-cmake
find_package(ignition-cmake3 REQUIRED)
set(IGN_CMAKE_VER ${ignition-cmake3_VERSION_MAJOR})
# Find gz-cmake
find_package(gz-cmake3 REQUIRED)
set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})

#------------------------------------------------------------------------
# Find ign-rendering
find_package(ignition-rendering7)
find_package(gz-rendering7)

#======================================
# Find Qt
Expand Down
2 changes: 1 addition & 1 deletion examples/simple_demo_qml/Main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ Item {
anchors.right: renderer.right
anchors.margins: 20
wrapMode: Text.WordWrap
text: "simple_demo_qml : the `simple_demo` example using ignition-rendering and QML."
text: "simple_demo_qml : the `simple_demo` example using gz-rendering and QML."
}
}
4 changes: 2 additions & 2 deletions examples/text_geom/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-text-geom)
project(gz-rendering-text-geom)

find_package(ignition-rendering7)
find_package(gz-rendering7)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
Expand Down
4 changes: 2 additions & 2 deletions examples/thermal_camera/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-thermal-camera)
find_package(ignition-rendering7 REQUIRED)
project(gz-rendering-thermal-camera)
find_package(gz-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
4 changes: 2 additions & 2 deletions examples/transform_control/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-transform-control)
find_package(ignition-rendering7 REQUIRED)
project(gz-rendering-transform-control)
find_package(gz-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
4 changes: 2 additions & 2 deletions examples/view_control/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-view-control)
find_package(ignition-rendering7 REQUIRED)
project(gz-rendering-view-control)
find_package(gz-rendering7 REQUIRED)

find_package(GLUT REQUIRED)
include_directories(SYSTEM ${GLUT_INCLUDE_DIRS})
Expand Down
4 changes: 2 additions & 2 deletions examples/visualization_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-visualization-demo)
project(gz-rendering-visualization-demo)

find_package(ignition-rendering7)
find_package(gz-rendering7)

if (APPLE OR UNIX)
find_package(GLUT REQUIRED)
Expand Down
4 changes: 2 additions & 2 deletions examples/waves/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-waves)
project(gz-rendering-waves)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
)

find_package(ignition-rendering7)
find_package(gz-rendering7)

set(TARGET_THIRD_PARTY_DEPENDS "")

Expand Down
4 changes: 2 additions & 2 deletions examples/wide_angle_camera/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-rendering-wide-angle-camera)
find_package(ignition-rendering7 REQUIRED)
project(gz-rendering-wide-angle-camera)
find_package(gz-rendering7 REQUIRED)

include_directories(SYSTEM
${PROJECT_BINARY_DIR}
Expand Down
4 changes: 2 additions & 2 deletions ogre/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ set_property(

target_link_libraries(${ogre_target}
PUBLIC
${ignition-common${IGN_COMMON_VER}_LIBRARIES}
${gz-common${GZ_COMMON_VER}_LIBRARIES}
PRIVATE
ignition-plugin${IGN_PLUGIN_VER}::register
gz-plugin${GZ_PLUGIN_VER}::register
${OPENGL_LIBRARIES}
IgnOGRE::IgnOGRE
)
Expand Down
4 changes: 2 additions & 2 deletions ogre2/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ target_include_directories(${ogre2_target}

target_link_libraries(${ogre2_target}
PUBLIC
${ignition-common${IGN_COMMON_VER}_LIBRARIES}
${gz-common${GZ_COMMON_VER}_LIBRARIES}
PRIVATE
ignition-plugin${IGN_PLUGIN_VER}::register
gz-plugin${GZ_PLUGIN_VER}::register
${OPENGL_LIBRARIES}
terra
IgnOGRE2::IgnOGRE2)
Expand Down
4 changes: 2 additions & 2 deletions optix/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ set_property(

target_link_libraries(${optix_target}
PUBLIC
${ignition-common${IGN_COMMON_VER}_LIBRARIES}
${gz-common${GZ_COMMON_VER}_LIBRARIES}
PRIVATE
ignition-plugin${IGN_PLUGIN_VER}::register
gz-plugin${GZ_PLUGIN_VER}::register
optix::optix
optix::optixu
optix::optix_prime)
Expand Down
Loading