From 1cdbc186fb65f1e6cdb626978cb055e1b23c07ae Mon Sep 17 00:00:00 2001 From: methylDragon Date: Wed, 11 May 2022 22:28:30 -0700 Subject: [PATCH 1/4] Move header files with git mv (#162) Signed-off-by: methylDragon --- include/{ignition => gz}/CMakeLists.txt | 0 include/{ignition => gz}/launch/CMakeLists.txt | 0 include/{ignition => gz}/launch/Plugin.hh | 0 include/{ignition => gz}/launch/config.hh.in | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename include/{ignition => gz}/CMakeLists.txt (100%) rename include/{ignition => gz}/launch/CMakeLists.txt (100%) rename include/{ignition => gz}/launch/Plugin.hh (100%) rename include/{ignition => gz}/launch/config.hh.in (100%) diff --git a/include/ignition/CMakeLists.txt b/include/gz/CMakeLists.txt similarity index 100% rename from include/ignition/CMakeLists.txt rename to include/gz/CMakeLists.txt diff --git a/include/ignition/launch/CMakeLists.txt b/include/gz/launch/CMakeLists.txt similarity index 100% rename from include/ignition/launch/CMakeLists.txt rename to include/gz/launch/CMakeLists.txt diff --git a/include/ignition/launch/Plugin.hh b/include/gz/launch/Plugin.hh similarity index 100% rename from include/ignition/launch/Plugin.hh rename to include/gz/launch/Plugin.hh diff --git a/include/ignition/launch/config.hh.in b/include/gz/launch/config.hh.in similarity index 100% rename from include/ignition/launch/config.hh.in rename to include/gz/launch/config.hh.in From 4ed722a0908693eb06cd38d19017c64b68d4aca1 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Wed, 11 May 2022 22:28:32 -0700 Subject: [PATCH 2/4] Create redirection aliases (#162) Signed-off-by: methylDragon --- include/ignition/launch.hh | 18 ++++++++++++++++++ include/ignition/launch/Export.hh | 18 ++++++++++++++++++ include/ignition/launch/Plugin.hh | 18 ++++++++++++++++++ include/ignition/launch/config.hh | 18 ++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 include/ignition/launch.hh create mode 100644 include/ignition/launch/Export.hh create mode 100644 include/ignition/launch/Plugin.hh create mode 100644 include/ignition/launch/config.hh diff --git a/include/ignition/launch.hh b/include/ignition/launch.hh new file mode 100644 index 00000000..e5234bb4 --- /dev/null +++ b/include/ignition/launch.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2022 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 diff --git a/include/ignition/launch/Export.hh b/include/ignition/launch/Export.hh new file mode 100644 index 00000000..ce04efed --- /dev/null +++ b/include/ignition/launch/Export.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2022 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 diff --git a/include/ignition/launch/Plugin.hh b/include/ignition/launch/Plugin.hh new file mode 100644 index 00000000..f0425b68 --- /dev/null +++ b/include/ignition/launch/Plugin.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2019 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 diff --git a/include/ignition/launch/config.hh b/include/ignition/launch/config.hh new file mode 100644 index 00000000..32104d75 --- /dev/null +++ b/include/ignition/launch/config.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2022 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 From d140df79a7a8c3a97688a96188aece0808d20ee4 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Wed, 11 May 2022 22:28:59 -0700 Subject: [PATCH 3/4] Migrate sources in src, test, examples, and include (#162) Signed-off-by: methylDragon --- include/gz/launch/Plugin.hh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/gz/launch/Plugin.hh b/include/gz/launch/Plugin.hh index a3b66e97..f9baf314 100644 --- a/include/gz/launch/Plugin.hh +++ b/include/gz/launch/Plugin.hh @@ -14,12 +14,12 @@ * limitations under the License. * */ -#ifndef IGNITION_LAUNCH_PLUGIN_HH_ -#define IGNITION_LAUNCH_PLUGIN_HH_ +#ifndef GZ_LAUNCH_PLUGIN_HH_ +#define GZ_LAUNCH_PLUGIN_HH_ #include -#include -#include +#include +#include namespace ignition { From 1ac9b6be6bd1289a02ea6490fb294d78103f69d8 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Wed, 11 May 2022 22:35:49 -0700 Subject: [PATCH 4/4] Migrate CMake files (#162) Signed-off-by: methylDragon --- CMakeLists.txt | 4 +++- include/CMakeLists.txt | 3 ++- test/CMakeLists.txt | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cf31d98a..a322227f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,9 @@ set(IGN_CMAKE_VER ${ignition-cmake3_VERSION_MAJOR}) #============================================================================ # Configure the project #============================================================================ -ign_configure_project(VERSION_SUFFIX) +ign_configure_project( + REPLACE_IGNITION_INCLUDE_PATH gz/launch + VERSION_SUFFIX) #============================================================================ # Set project-specific options diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 25ec8976..4b2bdd7b 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1 +1,2 @@ -add_subdirectory(ignition) +add_subdirectory(gz) +install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 942f5195..86694617 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -5,6 +5,7 @@ include_directories ( ${PROJECT_BINARY_DIR}/include/ ) +configure_file (test_config.hh.in ${PROJECT_BINARY_DIR}/include/gz/launch/test_config.hh) configure_file (test_config.hh.in ${PROJECT_BINARY_DIR}/include/ignition/launch/test_config.hh) # Build gtest