ign -> gz Header Migration : ign-utils

CMakeLists.txt

@@ -15,7 +15,9 @@ find_package(ignition-cmake3 REQUIRED)
 # Configure the project
 #============================================================================
 set(c++standard 17)
-ign_configure_project(VERSION_SUFFIX pre1)
+ign_configure_project(
+  REPLACE_IGNITION_INCLUDE_PATH gz/utils
+  VERSION_SUFFIX pre1)
 
 #============================================================================
 # Set project-specific options

cli/include/CMakeLists.txt

@@ -4,15 +4,15 @@
 # target_include_directories(@tgt@ INTERFACE "$<BUILD_INTERFACE:@incl_dirs>")
 # that for the usual include directories are handled by ign_add_component
 if(IGN_UTILS_VENDOR_CLI11)
-  add_subdirectory(vendored-cli/ignition/utils)
-  target_include_directories(${ign_utils_cli_target_name} 
+  add_subdirectory(vendored-cli/gz/utils)
+  target_include_directories(${gz_utils_cli_target_name} 
     INTERFACE
     "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/cli/include/vendored-cli>")
 else()
-  add_subdirectory(external-cli/ignition/utils)
-  target_include_directories(${ign_utils_cli_target_name} 
+  add_subdirectory(external-cli/gz/utils)
+  target_include_directories(${gz_utils_cli_target_name} 
     INTERFACE 
     "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/cli/include/external-cli>")
 endif()
 
-add_subdirectory(ignition/utils)
+add_subdirectory(gz/utils)

cli/include/external-cli/gz/utils/cli/App.hpp

@@ -0,0 +1,18 @@
+/*
+ * 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 <CLI/App.hpp>

cli/include/external-cli/gz/utils/cli/CLI.hpp

@@ -0,0 +1,18 @@
+/*
+ * 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 <CLI/CLI.hpp>

cli/include/external-cli/gz/utils/cli/Config.hpp

@@ -0,0 +1,18 @@
+/*
+ * 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 <CLI/Config.hpp>

cli/include/external-cli/gz/utils/cli/ConfigFwd.hpp

@@ -0,0 +1,18 @@
+/*
+ * 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 <CLI/ConfigFwd.hpp>

cli/include/external-cli/gz/utils/cli/Error.hpp

@@ -0,0 +1,18 @@
+/*
+ * 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 <CLI/Error.hpp>

cli/include/external-cli/gz/utils/cli/Formatter.hpp

@@ -0,0 +1,18 @@
+/*
+ * 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 <CLI/Formatter.hpp>

cli/include/external-cli/gz/utils/cli/FormatterFwd.hpp

@@ -0,0 +1,18 @@
+/*
+ * 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 <CLI/FormatterFwd.hpp>

cli/include/external-cli/gz/utils/cli/Macros.hpp

@@ -0,0 +1,18 @@
+/*
+ * 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 <CLI/Macros.hpp>

cli/include/external-cli/gz/utils/cli/Option.hpp

@@ -0,0 +1,18 @@
+/*
+ * 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 <CLI/Option.hpp>

cli/include/external-cli/gz/utils/cli/Split.hpp

@@ -0,0 +1,18 @@
+/*
+ * 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 <CLI/Split.hpp>

cli/include/external-cli/gz/utils/cli/StringTools.hpp

@@ -0,0 +1,18 @@
+/*
+ * 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 <CLI/StringTools.hpp>

cli/include/external-cli/gz/utils/cli/Timer.hpp

@@ -0,0 +1,18 @@
+/*
+ * 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 <CLI/Timer.hpp>

cli/include/external-cli/gz/utils/cli/TypeTools.hpp

@@ -0,0 +1,18 @@
+/*
+ * 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 <CLI/TypeTools.hpp>

cli/include/external-cli/gz/utils/cli/Validators.hpp

@@ -0,0 +1,18 @@
+/*
+ * 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 <CLI/Validators.hpp>

cli/include/external-cli/gz/utils/cli/Version.hpp

@@ -0,0 +1,18 @@
+/*
+ * 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 <CLI/Version.hpp>

cli/include/external-cli/ignition/utils/cli/App.hpp

@@ -15,4 +15,4 @@
  *
  */
 
-#include <CLI/App.hpp>
+#include <external-cli/gz/utils/cli/App.hpp>

cli/include/external-cli/ignition/utils/cli/CLI.hpp

@@ -15,4 +15,4 @@
  *
  */
 
-#include <CLI/CLI.hpp>
+#include <external-cli/gz/utils/cli/CLI.hpp>

cli/include/external-cli/ignition/utils/cli/Config.hpp

@@ -15,4 +15,4 @@
  *
  */
 
-#include <CLI/Config.hpp>
+#include <external-cli/gz/utils/cli/Config.hpp>

cli/include/external-cli/ignition/utils/cli/ConfigFwd.hpp

@@ -15,4 +15,4 @@
  *
  */
 
-#include <CLI/ConfigFwd.hpp>
+#include <external-cli/gz/utils/cli/ConfigFwd.hpp>

cli/include/external-cli/ignition/utils/cli/Error.hpp

@@ -15,4 +15,4 @@
  *
  */
 
-#include <CLI/Error.hpp>
+#include <external-cli/gz/utils/cli/Error.hpp>

cli/include/external-cli/ignition/utils/cli/Formatter.hpp

@@ -15,4 +15,4 @@
  *
  */
 
-#include <CLI/Formatter.hpp>
+#include <external-cli/gz/utils/cli/Formatter.hpp>

cli/include/external-cli/ignition/utils/cli/FormatterFwd.hpp

@@ -15,4 +15,4 @@
  *
  */
 
-#include <CLI/FormatterFwd.hpp>
+#include <external-cli/gz/utils/cli/FormatterFwd.hpp>

cli/include/external-cli/ignition/utils/cli/Macros.hpp

@@ -15,4 +15,4 @@
  *
  */
 
-#include <CLI/Macros.hpp>
+#include <external-cli/gz/utils/cli/Macros.hpp>

cli/include/external-cli/ignition/utils/cli/Option.hpp

@@ -15,4 +15,4 @@
  *
  */
 
-#include <CLI/Option.hpp>
+#include <external-cli/gz/utils/cli/Option.hpp>

cli/include/external-cli/ignition/utils/cli/Split.hpp

@@ -15,4 +15,4 @@
  *
  */
 
-#include <CLI/Split.hpp>
+#include <external-cli/gz/utils/cli/Split.hpp>

cli/include/external-cli/ignition/utils/cli/StringTools.hpp

@@ -15,4 +15,4 @@
  *
  */
 
-#include <CLI/StringTools.hpp>
+#include <external-cli/gz/utils/cli/StringTools.hpp>

cli/include/external-cli/ignition/utils/cli/Timer.hpp

@@ -15,4 +15,4 @@
  *
  */
 
-#include <CLI/Timer.hpp>
+#include <external-cli/gz/utils/cli/Timer.hpp>

cli/include/external-cli/ignition/utils/cli/TypeTools.hpp

@@ -15,4 +15,4 @@
  *
  */
 
-#include <CLI/TypeTools.hpp>
+#include <external-cli/gz/utils/cli/TypeTools.hpp>