Renames yaml_util to swri_yaml_util. Refs swri-robotics#231.

evenator · Aug 8, 2016 · cce92b7 · cce92b7
1 parent 01a1ccf
commit cce92b7
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 13 deletions.
diff --git a/swri_transform_util/CMakeLists.txt b/swri_transform_util/CMakeLists.txt
@@ -11,8 +11,8 @@ find_package(catkin REQUIRED COMPONENTS
   gps_common
   diagnostic_msgs
   swri_math_util
-  yaml_util
-)
+  swri_yaml_util
+) 
 
 find_package(OpenCV REQUIRED)
 
@@ -29,7 +29,7 @@ catkin_package(
     gps_common
     diagnostic_msgs
     swri_math_util
-    yaml_util
+    swri_yaml_util
 )
 
 include_directories(include ${catkin_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS})

diff --git a/swri_transform_util/package.xml b/swri_transform_util/package.xml
@@ -23,7 +23,10 @@
   <depend>gps_common</depend>
   <depend>diagnostic_msgs</depend>
   <depend>swri_math_util</depend>
-  <depend>yaml_util</depend>
+  <depend>swri_yaml_util</depend>
+  <depend>libgeos++-dev</depend>
+  <depend>proj</depend>
+  <test_depend>rostest</test_depend>
 
   <export>
     <swri_transform_util plugin="${prefix}/transformer_plugins.xml" />

diff --git a/swri_transform_util/src/georeference.cpp b/swri_transform_util/src/georeference.cpp
@@ -36,7 +36,7 @@
 
 // ROS libraries
 #include <ros/ros.h>
-#include <yaml_util/yaml_util.h>
+#include <swri_yaml_util/yaml_util.h>
 
 namespace swri_transform_util
 {
@@ -84,7 +84,7 @@ namespace swri_transform_util
   bool GeoReference::Load()
   {
     YAML::Node doc;
-    if (!yaml_util::LoadFile(path_, doc))
+    if (!swri_yaml_util::LoadFile(path_, doc))
     {
       ROS_ERROR("Failed to load file: %s", path_.c_str());
       return false;

diff --git a/yaml_util/CMakeLists.txt → swri_yaml_util/CMakeLists.txt b/yaml_util/CMakeLists.txt → swri_yaml_util/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8.3)
-project(yaml_util)
+project(swri_yaml_util)
 
 find_package(catkin REQUIRED)
 

diff --git a/yaml_util/include/yaml_util/.gitignore → ...ml_util/include/swri_yaml_util/.gitignore b/yaml_util/include/yaml_util/.gitignore → ...ml_util/include/swri_yaml_util/.gitignore
diff --git a/yaml_util/include/yaml_util/yaml_util.h → ...l_util/include/swri_yaml_util/yaml_util.h b/yaml_util/include/yaml_util/yaml_util.h → ...l_util/include/swri_yaml_util/yaml_util.h
@@ -35,7 +35,7 @@
 
 #include <yaml-cpp/yaml.h>
 
-#include <yaml_util/version.h>
+#include <swri_yaml_util/version.h>
 
 #ifndef YAMLCPP_OLD_API
 namespace YAML
@@ -52,7 +52,7 @@ namespace YAML
 }
 #endif  // YAMLCPP_OLD_API
 
-namespace yaml_util
+namespace swri_yaml_util
 {
   bool LoadFile(const std::string& path, YAML::Node& yaml);
   bool FindValue(const YAML::Node& node, const std::string& name);

diff --git a/yaml_util/package.xml → swri_yaml_util/package.xml b/yaml_util/package.xml → swri_yaml_util/package.xml
@@ -1,9 +1,9 @@
 <package format="2">
-  <name>yaml_util</name>
+  <name>swri_yaml_util</name>
   <version>0.0.1</version>
   <description>
 
-     yaml_util
+     swri_yaml_util
 
   </description>
   <author>Marc Alban</author>

diff --git a/yaml_util/src/yaml_util.cpp → swri_yaml_util/src/yaml_util.cpp b/yaml_util/src/yaml_util.cpp → swri_yaml_util/src/yaml_util.cpp
@@ -27,7 +27,7 @@
 //
 // *****************************************************************************
 
-#include <yaml_util/yaml_util.h>
+#include <swri_yaml_util/yaml_util.h>
 
 // C++ standard libraries
 #include <sstream>
@@ -86,7 +86,7 @@ namespace YAML
 }
 #endif  // YAMLCPP_OLD_API
 
-namespace yaml_util
+namespace swri_yaml_util
 {
   bool LoadFile(const std::string& path, YAML::Node& yaml)
   {

diff --git a/yaml_util/version.h.in → swri_yaml_util/version.h.in b/yaml_util/version.h.in → swri_yaml_util/version.h.in