Ticktock config macros

include/gz/launch/config.hh.in

@@ -1,24 +1,41 @@
+/*
+ * 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.
+ *
+ */
+
 /* Config.hh. Generated by CMake for @PROJECT_NAME@. */
 
+#ifndef GZ_LAUNCH_CONFIG_HH_
+#define GZ_LAUNCH_CONFIG_HH_
+
 /* Version number */
-#define IGNITION_LAUNCH_MAJOR_VERSION ${PROJECT_VERSION_MAJOR}
-#define IGNITION_LAUNCH_MINOR_VERSION ${PROJECT_VERSION_MINOR}
-#define IGNITION_LAUNCH_PATCH_VERSION ${PROJECT_VERSION_PATCH}
+#define GZ_LAUNCH_MAJOR_VERSION ${PROJECT_VERSION_MAJOR}
+#define GZ_LAUNCH_MINOR_VERSION ${PROJECT_VERSION_MINOR}
+#define GZ_LAUNCH_PATCH_VERSION ${PROJECT_VERSION_PATCH}
 
-#define IGNITION_LAUNCH_VERSION "${PROJECT_VERSION}"
-#define IGNITION_LAUNCH_VERSION_FULL "${PROJECT_VERSION_FULL}"
+#define GZ_LAUNCH_VERSION "${PROJECT_VERSION}"
+#define GZ_LAUNCH_VERSION_FULL "${PROJECT_VERSION_FULL}"
 
-#define IGNITION_LAUNCH_VERSION_HEADER "${PROJECT_NAME_LOWER}, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2019 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n"
+#define GZ_LAUNCH_VERSION_HEADER "Gz Launch, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2019 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n"
 
-#define IGNITION_LAUNCH_INITIAL_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${IGN_DATA_INSTALL_DIR}/configs"
+#define GZ_LAUNCH_INITIAL_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/${IGN_DATA_INSTALL_DIR}/configs"
 
-#define IGNITION_LAUNCH_PLUGIN_INSTALL_PATH "${IGN_LAUNCH_PLUGIN_INSTALL_PATH}"
+#define GZ_LAUNCH_PLUGIN_INSTALL_PATH "${IGN_LAUNCH_PLUGIN_INSTALL_PATH}"
 
 #cmakedefine BUILD_TYPE_PROFILE 1
 #cmakedefine BUILD_TYPE_DEBUG 1
 #cmakedefine BUILD_TYPE_RELEASE 1
 
-namespace [[deprecated("Use gz namespace.")]]  ignition
-{
- using namespace gz;
-}
+#endif

include/ignition/launch/config.hh

@@ -15,4 +15,30 @@
  *
  */
 
+#ifndef IGNITION_LAUNCH__CONFIG_HH_
+#define IGNITION_LAUNCH__CONFIG_HH_
+
 #include <gz/launch/config.hh>
+
+#define IGNITION_LAUNCH_MAJOR_VERSION GZ_LAUNCH_MAJOR_VERSION
+#define IGNITION_LAUNCH_MINOR_VERSION GZ_LAUNCH_MINOR_VERSION
+#define IGNITION_LAUNCH_PATCH_VERSION GZ_LAUNCH_PATCH_VERSION
+
+#define IGNITION_LAUNCH_VERSION GZ_LAUNCH_VERSION
+#define IGNITION_LAUNCH_VERSION_FULL GZ_LAUNCH_VERSION_FULL
+
+#define IGNITION_LAUNCH_VERSION_HEADER GZ_LAUNCH_VERSION_HEADER
+
+#define IGNITION_LAUNCH_PLUGIN_INITIAL_CONFIG_PATH GZ_LAUNCH_PLUGIN_INITIAL_CONFIG_PATH
+
+#define IGNITION_LAUNCH_PLUGIN_INSTALL_DIR GZ_LAUNCH_PLUGIN_INSTALL_DIR
+
+namespace ignition
+{
+  #ifndef SUPPRESS_IGNITION_HEADER_DEPRECATION
+    #pragma message("ignition namespace is deprecated! Use gz instead!")
+  #endif
+  using namespace gz;
+}
+
+#endif