Skip to content

Commit

Permalink
Rename CMake project to gz (#250)
Browse files Browse the repository at this point in the history
Signed-off-by: Louise Poubel <[email protected]>
  • Loading branch information
chapulina authored Jun 25, 2022
1 parent 373d333 commit 7ab8a5c
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
16 changes: 8 additions & 8 deletions BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
load(
"//ign_bazel:build_defs.bzl",
"//gz_bazel:build_defs.bzl",
"IGNITION_ROOT",
"IGNITION_VISIBILITY",
"cmake_configure_file",
"generate_include_header",
"generate_yaml",
"ign_config_header",
"ign_export_header",
"gz_config_header",
"gz_export_header",
)
load(
":gz_msg_gen.bzl",
Expand All @@ -26,7 +26,7 @@ licenses(["notice"])

exports_files(["LICENSE"])

PROJECT_NAME = "ignition-msgs"
PROJECT_NAME = "gz-msgs"

PROJECT_MAJOR = 8

Expand All @@ -35,15 +35,15 @@ PROJECT_MINOR = 0
PROJECT_PATCH = 0

# Generates config.hh based on the version numbers in CMake code.
ign_config_header(
gz_config_header(
name = "config",
src = "include/gz/msgs/config.hh.in",
cmakelists = ["CMakeLists.txt"],
project_name = PROJECT_NAME,
project_version = (PROJECT_MAJOR, PROJECT_MINOR, PROJECT_PATCH),
)

ign_export_header(
gz_export_header(
name = "include/gz/msgs/Export.hh",
export_base = "IGNITION_MSGS",
lib_name = "ignition-msgs",
Expand Down Expand Up @@ -127,7 +127,7 @@ cc_library(
includes = ["include"],
deps = [
":gzmsgs_proto_cc",
IGNITION_ROOT + "ign_math",
IGNITION_ROOT + "gz_math",
"@com_google_protobuf//:protobuf",
"@tinyxml2",
],
Expand All @@ -154,7 +154,7 @@ cc_binary(
data = [IGNITION_ROOT + "gz_msgs/test:desc/stringmsg.desc"],
deps = [
":gz_msgs",
IGNITION_ROOT + "ign_math",
IGNITION_ROOT + "gz_math",
IGNITION_ROOT + "gz_msgs/test:test_utils",
"@gtest",
"@gtest//:gtest_main",
Expand Down
16 changes: 8 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(ignition-msgs9 VERSION 9.0.0)
project(gz-msgs9 VERSION 9.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)
# If you get an error at this line, you need to install gz-cmake
find_package(gz-cmake3 REQUIRED)

#============================================================================
# Configure the project
Expand Down Expand Up @@ -83,9 +83,9 @@ gz_find_package(IgnProtobuf
PRETTY Protobuf)

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

#--------------------------------------
# Find if gz command is available
Expand Down Expand Up @@ -142,5 +142,5 @@ gz_create_docs(
# Wait to build the doc for the autogenerated code
# The TARGET will exist if doxygen is installed
if(TARGET doc)
add_dependencies(doc ignition-msgs${PROJECT_VERSION_MAJOR})
add_dependencies(doc gz-msgs${PROJECT_VERSION_MAJOR})
endif()
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ target_include_directories(${PROJECT_LIBRARY_TARGET_NAME}
target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
PUBLIC
protobuf::libprotobuf
ignition-math${IGN_MATH_VER}::ignition-math${IGN_MATH_VER}
gz-math${GZ_MATH_VER}::gz-math${GZ_MATH_VER}
PRIVATE
TINYXML2::TINYXML2
)
Expand Down
2 changes: 1 addition & 1 deletion test/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load(
"//ign_bazel:build_defs.bzl",
"//gz_bazel:build_defs.bzl",
"IGNITION_ROOT",
"IGNITION_VISIBILITY",
"cmake_configure_file",
Expand Down

0 comments on commit 7ab8a5c

Please sign in to comment.