From f159d97f95cdfe7da98a28d57246b1b5e750b9db Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Thu, 8 Dec 2022 09:11:36 -0800
Subject: [PATCH] Fix include/ignition/.../parameters header files (#374)

The ignition redirection headers for the parameters
component were not installed. Also fix result.hh.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 parameters/include/CMakeLists.txt             |  2 ++
 parameters/include/gz/CMakeLists.txt          |  1 +
 .../include/ignition/transport/parameters.hh  | 19 +++++++++++++++++++
 .../transport/{ => parameters}/Client.hh      |  0
 .../ignition/transport/parameters/Export.hh   | 19 +++++++++++++++++++
 .../transport/{ => parameters}/Interface.hh   |  0
 .../transport/{ => parameters}/Registry.hh    |  0
 .../transport/{ => parameters}/result.hh      |  2 +-
 8 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 parameters/include/CMakeLists.txt
 create mode 100644 parameters/include/gz/CMakeLists.txt
 create mode 100644 parameters/include/ignition/transport/parameters.hh
 rename parameters/include/ignition/transport/{ => parameters}/Client.hh (100%)
 create mode 100644 parameters/include/ignition/transport/parameters/Export.hh
 rename parameters/include/ignition/transport/{ => parameters}/Interface.hh (100%)
 rename parameters/include/ignition/transport/{ => parameters}/Registry.hh (100%)
 rename parameters/include/ignition/transport/{ => parameters}/result.hh (93%)

diff --git a/parameters/include/CMakeLists.txt b/parameters/include/CMakeLists.txt
new file mode 100644
index 000000000..4b2bdd7bb
--- /dev/null
+++ b/parameters/include/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(gz)
+install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
diff --git a/parameters/include/gz/CMakeLists.txt b/parameters/include/gz/CMakeLists.txt
new file mode 100644
index 000000000..321a9fe17
--- /dev/null
+++ b/parameters/include/gz/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(transport)
diff --git a/parameters/include/ignition/transport/parameters.hh b/parameters/include/ignition/transport/parameters.hh
new file mode 100644
index 000000000..def0d44c3
--- /dev/null
+++ b/parameters/include/ignition/transport/parameters.hh
@@ -0,0 +1,19 @@
+/*
+ * 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 <gz/transport/parameters.hh>
+#include <ignition/transport/config.hh>
diff --git a/parameters/include/ignition/transport/Client.hh b/parameters/include/ignition/transport/parameters/Client.hh
similarity index 100%
rename from parameters/include/ignition/transport/Client.hh
rename to parameters/include/ignition/transport/parameters/Client.hh
diff --git a/parameters/include/ignition/transport/parameters/Export.hh b/parameters/include/ignition/transport/parameters/Export.hh
new file mode 100644
index 000000000..bcd978a8b
--- /dev/null
+++ b/parameters/include/ignition/transport/parameters/Export.hh
@@ -0,0 +1,19 @@
+/*
+ * 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 <gz/transport/parameters/Export.hh>
+#include <ignition/transport/config.hh>
diff --git a/parameters/include/ignition/transport/Interface.hh b/parameters/include/ignition/transport/parameters/Interface.hh
similarity index 100%
rename from parameters/include/ignition/transport/Interface.hh
rename to parameters/include/ignition/transport/parameters/Interface.hh
diff --git a/parameters/include/ignition/transport/Registry.hh b/parameters/include/ignition/transport/parameters/Registry.hh
similarity index 100%
rename from parameters/include/ignition/transport/Registry.hh
rename to parameters/include/ignition/transport/parameters/Registry.hh
diff --git a/parameters/include/ignition/transport/result.hh b/parameters/include/ignition/transport/parameters/result.hh
similarity index 93%
rename from parameters/include/ignition/transport/result.hh
rename to parameters/include/ignition/transport/parameters/result.hh
index 01a18c815..e1f6b884c 100644
--- a/parameters/include/ignition/transport/result.hh
+++ b/parameters/include/ignition/transport/parameters/result.hh
@@ -15,5 +15,5 @@
  *
  */
 
-#include <gz/transport/parameters/results.hh>
+#include <gz/transport/parameters/result.hh>
 #include <ignition/transport/config.hh>