Fixes after the initial merge

Signed-off-by: Jose Luis Rivero <jrivero@honurobotics.com>
gazebosim · Feb 17, 2025 · 9287af6 · 9287af6
1 parent 9498b62
commit 9287af6
Show file tree

Hide file tree

Showing 12 changed files with 58 additions and 26 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -52,30 +52,30 @@ foreach(example ${example_directories})
     set(example_tarball_name no_gz_prefix-0.1.0.tar.bz2)
   elseif (${example} STREQUAL "prerelease")
     set(example_tarball_name gz-minimal-1.0.0~pre1.tar.bz2)
-  elseif (${example} STREQUAL "core_nodep")
-    set(example_tarball_name gz-core_no_deps-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "c_nodep")
+    set(example_tarball_name gz-c_no_deps-0.1.0.tar.bz2)
     set(run_codecheck true)
-  elseif (${example} STREQUAL "core_nodep_static")
-    set(example_tarball_name gz-core_no_deps_static-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "c_nodep_static")
+    set(example_tarball_name gz-c_no_deps_static-0.1.0.tar.bz2)
     set(run_codecheck true)
-  elseif (${example} STREQUAL "core_child")
-    set(example_tarball_name gz-core_child-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "c_child")
+    set(example_tarball_name gz-c_child-0.1.0.tar.bz2)
     set(run_codecheck true)
-  elseif (${example} STREQUAL "core_child_private")
-    set(example_tarball_name gz-core_child_private-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "c_child_private")
+    set(example_tarball_name gz-c_child_private-0.1.0.tar.bz2)
     set(run_codecheck true)
-  elseif (${example} STREQUAL "core_static_child")
-    set(example_tarball_name gz-core_static_child-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "c_static_child")
+    set(example_tarball_name gz-c_static_child-0.1.0.tar.bz2)
     set(run_codecheck true)
   elseif (${example} STREQUAL "comp_deps")
-    set(example_tarball_name gz-component_deps-0.1.0.tar.bz2)
-  elseif (${example} STREQUAL "use_component_depsA")
-    set(example_tarball_name gz-use_component_depsa-0.1.0.tar.bz2)
-  elseif (${example} STREQUAL "use_component_depsB")
-    set(example_tarball_name gz-use_component_depsb-0.1.0.tar.bz2)
-  elseif (${example} STREQUAL "use_component_depsC")
-    set(example_tarball_name gz-use_component_depsc-0.1.0.tar.bz2)
-  elseif (${example} STREQUAL "use_config_ifp")
+    set(example_tarball_name gz-comp_deps-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "comp_depsA")
+    set(example_tarball_name gz-comp_depsa-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "comp_depsB")
+    set(example_tarball_name gz-comp_depsb-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "comp_depsC")
+    set(example_tarball_name gz-comp_depsc-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "config_ifp")
     set(example_tarball_name  gz-find_config-0.1.0.tar.bz2)
   elseif (${example} STREQUAL "version_from_package_xml")
     set(example_tarball_name  gz-version_from_package_xml-8.21.65.tar.bz2)

diff --git a/examples/c_child_private/src/CMakeLists.txt b/examples/c_child_private/src/CMakeLists.txt
@@ -2,5 +2,5 @@ gz_get_libsources_and_unittests(sources gtest_sources)
 gz_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PRIVATE
-    gz-core_no_deps::gz-c_no_deps)
+    gz-c_no_deps::gz-c_no_deps)
 gz_build_tests(TYPE UNIT SOURCES ${gtest_sources})
diff --git a/examples/c_nodep/src/CMakeLists.txt b/examples/c_nodep/src/CMakeLists.txt
@@ -0,0 +1,3 @@
+gz_get_libsources_and_unittests(sources gtest_sources)
+gz_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
+gz_build_tests(TYPE UNIT SOURCES ${gtest_sources})
diff --git a/examples/comp_deps/CMakeLists.txt b/examples/comp_deps/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
-project(gz-component_deps VERSION 0.1.0)
+project(gz-comp_deps VERSION 0.1.0)
 find_package(gz-cmake4 REQUIRED)
 gz_configure_project(
   REPLACE_INCLUDE_PATH gz/comp_deps

diff --git a/examples/comp_deps/src/AlmostEmpty.cc b/examples/comp_deps/src/AlmostEmpty.cc
@@ -19,7 +19,7 @@
 
 namespace gz
 {
-  namespace comp_deps
+  namespace c_deps
   {
     class GZ_COMP_DEPS_VISIBLE AlmostEmpty
     {

diff --git a/examples/comp_depsA/CMakeLists.txt b/examples/comp_depsA/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
-project(gz-use_comp_depsA VERSION 0.1.0)
+project(gz-comp_depsA VERSION 0.1.0)
 find_package(gz-cmake4 REQUIRED)
 gz_configure_project()
 gz_find_package(gz-comp_deps REQUIRED COMPONENTS child)

diff --git a/examples/comp_depsB/CMakeLists.txt b/examples/comp_depsB/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
-project(comp_depsA VERSION 0.1.0)
+project(comp_depsB VERSION 0.1.0)
 find_package(gz-cmake4 REQUIRED)
 gz_configure_project()
 gz_find_package(gz-comp_deps REQUIRED COMPONENTS parent child)

diff --git a/examples/comp_depsB/README.md b/examples/comp_depsB/README.md
@@ -1,7 +1,7 @@
-# use\_component\_depsB
+# component\_depsB
 
 This package uses the `child` and `parent` components of `component\_deps`
 and calls `gz_find_package` with the components specified
 in the order `child parent`.
 Aside from the order in which the components are specified,
-this package is identical to `use_comp_depsA`.
+this package is identical to `comp_depsB`.
diff --git a/examples/comp_depsC/CMakeLists.txt b/examples/comp_depsC/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
-project(comp_depsB VERSION 0.1.0)
+project(comp_depsC VERSION 0.1.0)
 find_package(gz-cmake4 REQUIRED)
 gz_configure_project()
 gz_find_package(gz-comp_deps REQUIRED COMPONENTS child parent)

diff --git a/examples/config_ifp/Findgz-find_config.cmake b/examples/config_ifp/Findgz-find_config.cmake
@@ -0,0 +1 @@
+set(CONFIG_TEST "The package was found using MODULE mode")
diff --git a/examples/config_ifp/gz-find_configConfig.cmake b/examples/config_ifp/gz-find_configConfig.cmake
@@ -0,0 +1 @@
+set(CONFIG_TEST "The package was found using CONFIG mode")
diff --git a/examples/no_gz_prefix/src/AlmostEmpty.cc b/examples/no_gz_prefix/src/AlmostEmpty.cc
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2021 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+*/
+
+#include <no_gz_prefix.hh>
+#include <no_gz/config.hh>
+#include <no_gz/Export.hh>
+
+namespace no_gz_prefix
+{
+  class GZ_NO_GZ_PREFIX_VISIBLE AlmostEmpty
+  {
+  };
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		set(CONFIG_TEST "The package was found using MODULE mode")