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

Jump to bottom

Rename CMake project to gz #82

Merged
merged 1 commit into from
Jun 25, 2022
Merged

Rename CMake project to gz #82

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
14 changes: 7 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(ignition-plugin2 VERSION 2.0.0)
project(gz-plugin2 VERSION 2.0.0)

#============================================================================
# Find ignition-cmake
# Find gz-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})

#============================================================================
# Configure the project
Expand Down Expand Up @@ -44,9 +44,9 @@ find_program(GZ_TOOLS_PROGRAM gz)


#--------------------------------------
# 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})


#============================================================================
Expand Down
2 changes: 1 addition & 1 deletion core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gz_create_core_library(
CXX_STANDARD 17)

target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
PUBLIC ignition-utils${IGN_UTILS_VER}::ignition-utils${IGN_UTILS_VER})
PUBLIC gz-utils${GZ_UTILS_VER}::gz-utils${GZ_UTILS_VER})

# Build the unit tests
gz_build_tests(
Expand Down
18 changes: 9 additions & 9 deletions examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR)

project(examples)

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

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

find_package(ignition-math7 QUIET)
set(IGN_MATH_VER ${ignition-math7_VERSION_MAJOR})
find_package(gz-math7 QUIET)
set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})

add_subdirectory(plugins)

Expand All @@ -30,9 +30,9 @@ foreach(example_file ${example_files})

target_link_libraries(${example}
PRIVATE
ignition-plugin${IGN_PLUGIN_VER}::loader
ignition-common${IGN_COMMON_VER}::core
ignition-math${IGN_MATH_VER}::core
gz-plugin${GZ_PLUGIN_VER}::loader
gz-common${GZ_COMMON_VER}::core
gz-math${GZ_MATH_VER}::core
)

# This is only needed for the examples that use plugins, but it doesn't hurt
Expand Down
4 changes: 2 additions & 2 deletions examples/plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ foreach(plugin_file ${plugin_files})

target_link_libraries(${plugin}
PRIVATE
ignition-plugin${IGN_PLUGIN_VER}::register
ignition-math${IGN_MATH_VER}::core)
gz-plugin${GZ_PLUGIN_VER}::register
gz-math${GZ_MATH_VER}::core)

# All these libraries will go into the same directory, so it's sufficient for
# us to grab the last one.
Expand Down
2 changes: 1 addition & 1 deletion loader/src/cmd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set(plugin_executable ign-plugin)
add_executable(${plugin_executable} plugin_main.cc)
target_link_libraries(${plugin_executable}
gz
ignition-utils${IGN_UTILS_VER}::cli
gz-utils${GZ_UTILS_VER}::cli
${loader}
)

Expand Down