From eb3b748bde37a38bd4da571a8bd6d48a1a7a9bd5 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Wed, 27 Apr 2022 16:07:25 -0700 Subject: [PATCH] Manual: Fix Examples Signed-off-by: methylDragon --- examples/CMakeLists.txt | 28 +++++++++---------- examples/comp_deps/CMakeLists.txt | 3 +- examples/comp_deps/src/AlmostEmpty.cc | 2 +- examples/core_nodep/src/AlmostEmpty.cc | 2 +- examples/core_nodep_static/src/AlmostEmpty.cc | 2 +- examples/no_gz_prefix/CMakeLists.txt | 2 +- examples/no_gz_prefix/src/AlmostEmpty.cc | 8 +++--- 7 files changed, 24 insertions(+), 23 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 301bd7e9..30464fb8 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -9,7 +9,7 @@ if (NOT WIN32 AND EXAMPLE_LCOV_PATH) endif() set(example_directories - ign_conf + gz_conf no_gz_prefix prerelease core_nodep @@ -31,36 +31,36 @@ endif() foreach(example ${example_directories}) set(run_codecheck false) if (${example} STREQUAL "gz_conf") - set(example_tarball_name gz-minimal-0.1.0.tar.bz2) + set(example_tarball_name ignition-minimal-0.1.0.tar.bz2) elseif (${example} STREQUAL "no_gz_prefix") 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) + set(example_tarball_name ignition-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) + set(example_tarball_name ignition-core_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) + set(example_tarball_name ignition-core_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) + set(example_tarball_name ignition-core_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) + set(example_tarball_name ignition-core_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) + set(example_tarball_name ignition-core_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) + set(example_tarball_name ignition-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) + set(example_tarball_name ignition-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) + set(example_tarball_name ignition-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) + set(example_tarball_name ignition-use_component_depsc-0.1.0.tar.bz2) elseif (${example} STREQUAL "use_config_ifp") - set(example_tarball_name gz-find_config-0.1.0.tar.bz2) + set(example_tarball_name ignition-find_config-0.1.0.tar.bz2) else() set(example_tarball_name) @@ -192,7 +192,7 @@ if (UNIX) @ONLY) set(_env_vars) # On Debian and if the install prefix is /usr, the default CMAKE_INSTALL_LIBDIR of this project - # as set by GNUInstallDirs will be different from the one of the example project, + # as set by GNUInstallDirs will be different from the one of the example project, # so let's hardcode it in that case if(EXISTS "/etc/debian_version" AND "${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$") set(example_PKGCONFIG_INSTALL_LIBDIR "lib/pkgconfig") diff --git a/examples/comp_deps/CMakeLists.txt b/examples/comp_deps/CMakeLists.txt index 5ae53288..7ca81cb8 100644 --- a/examples/comp_deps/CMakeLists.txt +++ b/examples/comp_deps/CMakeLists.txt @@ -1,7 +1,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(ignition-component_deps VERSION 0.1.0) find_package(ignition-cmake3 REQUIRED) -ign_configure_project() +ign_configure_project( + REPLACE_IGNITION_INCLUDE_PATH gz/component_deps) ign_configure_build(QUIT_IF_BUILD_ERRORS COMPONENTS child parent) ign_create_packages() diff --git a/examples/comp_deps/src/AlmostEmpty.cc b/examples/comp_deps/src/AlmostEmpty.cc index da65eaa2..7e8d8559 100644 --- a/examples/comp_deps/src/AlmostEmpty.cc +++ b/examples/comp_deps/src/AlmostEmpty.cc @@ -15,7 +15,7 @@ * */ -#include +#include namespace ignition { diff --git a/examples/core_nodep/src/AlmostEmpty.cc b/examples/core_nodep/src/AlmostEmpty.cc index 0a1c6df8..41213d81 100644 --- a/examples/core_nodep/src/AlmostEmpty.cc +++ b/examples/core_nodep/src/AlmostEmpty.cc @@ -15,7 +15,7 @@ * */ -#include +#include namespace ignition { diff --git a/examples/core_nodep_static/src/AlmostEmpty.cc b/examples/core_nodep_static/src/AlmostEmpty.cc index f55af640..18538c77 100644 --- a/examples/core_nodep_static/src/AlmostEmpty.cc +++ b/examples/core_nodep_static/src/AlmostEmpty.cc @@ -15,7 +15,7 @@ * */ -#include +#include namespace ignition { diff --git a/examples/no_gz_prefix/CMakeLists.txt b/examples/no_gz_prefix/CMakeLists.txt index 1ea572b4..5f72a6df 100644 --- a/examples/no_gz_prefix/CMakeLists.txt +++ b/examples/no_gz_prefix/CMakeLists.txt @@ -3,7 +3,7 @@ project(no_gz_prefix VERSION 0.1.0) find_package(ignition-cmake3 REQUIRED) ign_configure_project( NO_IGNITION_PREFIX - REPLACE_IGNITION_INCLUDE_PATH no_ign) + REPLACE_IGNITION_INCLUDE_PATH no_gz) ign_configure_build(QUIT_IF_BUILD_ERRORS) ign_create_packages() ign_create_docs() diff --git a/examples/no_gz_prefix/src/AlmostEmpty.cc b/examples/no_gz_prefix/src/AlmostEmpty.cc index d3029192..d205369f 100644 --- a/examples/no_gz_prefix/src/AlmostEmpty.cc +++ b/examples/no_gz_prefix/src/AlmostEmpty.cc @@ -15,11 +15,11 @@ * */ -#include -#include -#include +#include +#include +#include -namespace no_ignition_prefix +namespace no_gz_prefix { class IGNITION_NO_IGNITION_PREFIX_VISIBLE AlmostEmpty {