diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a859c9..62b8acb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10) -project(xmlrpcpp) +project(robot_xmlrpcpp) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -9,7 +9,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-Wall -Wextra -Wpedantic -fPIC) endif() -add_library(xmlrpcpp +add_library(robot_xmlrpcpp src/XmlRpcClient.cpp src/XmlRpcDispatch.cpp src/XmlRpcServer.cpp @@ -21,15 +21,15 @@ add_library(xmlrpcpp src/XmlRpcValue.cpp ) -target_include_directories(xmlrpcpp +target_include_directories(robot_xmlrpcpp PUBLIC $ $ ) # --- Cài đặt thư viện vào hệ thống khi chạy make install --- -install(TARGETS xmlrpcpp - EXPORT xmlrpcpp-targets +install(TARGETS robot_xmlrpcpp + EXPORT robot_xmlrpcpp-targets ARCHIVE DESTINATION lib # Thư viện tĩnh .a LIBRARY DESTINATION lib # Thư viện động .so RUNTIME DESTINATION bin # File thực thi (nếu có) @@ -41,13 +41,13 @@ install( DESTINATION include/ ) -# --- Xuất export set xmlrpcpp-targets thành file CMake module --- -# --- Tạo file lib/cmake/xmlrpcpp/xmlrpcpp-targets.cmake --- +# --- Xuất export set robot_xmlrpcpp-targets thành file CMake module --- +# --- Tạo file lib/cmake/robot_xmlrpcpp/robot_xmlrpcpp-targets.cmake --- # --- File này chứa cấu hình giúp project khác có thể dùng --- -# --- Find_package(xmlrpcpp REQUIRED) --- -# --- Target_link_libraries(my_app PRIVATE xmlrpcpp::xmlrpcpp) --- -install(EXPORT xmlrpcpp-targets - FILE xmlrpcpp-targets.cmake - NAMESPACE xmlrpcpp:: - DESTINATION lib/cmake/xmlrpcpp +# --- Find_package(robot_xmlrpcpp REQUIRED) --- +# --- Target_link_libraries(my_app PRIVATE robot_xmlrpcpp::robot_xmlrpcpp) --- +install(EXPORT robot_xmlrpcpp-targets + FILE robot_xmlrpcpp-targets.cmake + NAMESPACE robot_xmlrpcpp:: + DESTINATION lib/cmake/robot_xmlrpcpp ) diff --git a/include/xmlrpcpp/XmlRpc.h b/include/robot_xmlrpcpp/XmlRpc.h similarity index 100% rename from include/xmlrpcpp/XmlRpc.h rename to include/robot_xmlrpcpp/XmlRpc.h diff --git a/include/xmlrpcpp/XmlRpcClient.h b/include/robot_xmlrpcpp/XmlRpcClient.h similarity index 95% rename from include/xmlrpcpp/XmlRpcClient.h rename to include/robot_xmlrpcpp/XmlRpcClient.h index 949850a..2e22197 100644 --- a/include/xmlrpcpp/XmlRpcClient.h +++ b/include/robot_xmlrpcpp/XmlRpcClient.h @@ -13,8 +13,8 @@ # include #endif -#include "xmlrpcpp/XmlRpcDispatch.h" -#include "xmlrpcpp/XmlRpcSource.h" +#include "robot_xmlrpcpp/XmlRpcDispatch.h" +#include "robot_xmlrpcpp/XmlRpcSource.h" namespace robot { namespace XmlRpc { diff --git a/include/xmlrpcpp/XmlRpcDispatch.h b/include/robot_xmlrpcpp/XmlRpcDispatch.h similarity index 100% rename from include/xmlrpcpp/XmlRpcDispatch.h rename to include/robot_xmlrpcpp/XmlRpcDispatch.h diff --git a/include/xmlrpcpp/XmlRpcException.h b/include/robot_xmlrpcpp/XmlRpcException.h similarity index 100% rename from include/xmlrpcpp/XmlRpcException.h rename to include/robot_xmlrpcpp/XmlRpcException.h diff --git a/include/xmlrpcpp/XmlRpcServer.h b/include/robot_xmlrpcpp/XmlRpcServer.h similarity index 93% rename from include/xmlrpcpp/XmlRpcServer.h rename to include/robot_xmlrpcpp/XmlRpcServer.h index 4ef260c..9f93dd6 100644 --- a/include/xmlrpcpp/XmlRpcServer.h +++ b/include/robot_xmlrpcpp/XmlRpcServer.h @@ -13,8 +13,8 @@ # include #endif -#include "xmlrpcpp/XmlRpcDispatch.h" -#include "xmlrpcpp/XmlRpcSource.h" +#include "robot_xmlrpcpp/XmlRpcDispatch.h" +#include "robot_xmlrpcpp/XmlRpcSource.h" namespace robot { namespace XmlRpc { diff --git a/include/xmlrpcpp/XmlRpcServerConnection.h b/include/robot_xmlrpcpp/XmlRpcServerConnection.h similarity index 94% rename from include/xmlrpcpp/XmlRpcServerConnection.h rename to include/robot_xmlrpcpp/XmlRpcServerConnection.h index a21b703..a0c187a 100644 --- a/include/xmlrpcpp/XmlRpcServerConnection.h +++ b/include/robot_xmlrpcpp/XmlRpcServerConnection.h @@ -11,8 +11,8 @@ # include #endif -#include "xmlrpcpp/XmlRpcValue.h" -#include "xmlrpcpp/XmlRpcSource.h" +#include "robot_xmlrpcpp/XmlRpcValue.h" +#include "robot_xmlrpcpp/XmlRpcSource.h" namespace robot { namespace XmlRpc { diff --git a/include/xmlrpcpp/XmlRpcServerMethod.h b/include/robot_xmlrpcpp/XmlRpcServerMethod.h similarity index 100% rename from include/xmlrpcpp/XmlRpcServerMethod.h rename to include/robot_xmlrpcpp/XmlRpcServerMethod.h diff --git a/include/xmlrpcpp/XmlRpcSocket.h b/include/robot_xmlrpcpp/XmlRpcSocket.h similarity index 100% rename from include/xmlrpcpp/XmlRpcSocket.h rename to include/robot_xmlrpcpp/XmlRpcSocket.h diff --git a/include/xmlrpcpp/XmlRpcSource.h b/include/robot_xmlrpcpp/XmlRpcSource.h similarity index 100% rename from include/xmlrpcpp/XmlRpcSource.h rename to include/robot_xmlrpcpp/XmlRpcSource.h diff --git a/include/xmlrpcpp/XmlRpcUtil.h b/include/robot_xmlrpcpp/XmlRpcUtil.h similarity index 100% rename from include/xmlrpcpp/XmlRpcUtil.h rename to include/robot_xmlrpcpp/XmlRpcUtil.h diff --git a/include/xmlrpcpp/XmlRpcValue.h b/include/robot_xmlrpcpp/XmlRpcValue.h similarity index 100% rename from include/xmlrpcpp/XmlRpcValue.h rename to include/robot_xmlrpcpp/XmlRpcValue.h diff --git a/include/xmlrpcpp/base64.h b/include/robot_xmlrpcpp/base64.h similarity index 100% rename from include/xmlrpcpp/base64.h rename to include/robot_xmlrpcpp/base64.h diff --git a/package.xml b/package.xml index e389dc1..c1db06f 100644 --- a/package.xml +++ b/package.xml @@ -1,9 +1,9 @@ - xmlrpcpp + robot_xmlrpcpp 0.7.10 - xmlrpcpp is the second generation of the transform library, which lets - the user keep track of multiple coordinate frames over time. xmlrpcpp + robot_xmlrpcpp is the second generation of the transform library, which lets + the user keep track of multiple coordinate frames over time. robot_xmlrpcpp maintains the relationship between coordinate frames in a tree structure buffered in time, and lets the user transform points, vectors, etc between any two coordinate frames at any desired @@ -15,7 +15,7 @@ Tully Foote BSD - http://www.ros.org/wiki/xmlrpcpp + http://www.ros.org/wiki/robot_xmlrpcpp catkin diff --git a/src/XmlRpcClient.cpp b/src/XmlRpcClient.cpp index 2709705..b264c4b 100644 --- a/src/XmlRpcClient.cpp +++ b/src/XmlRpcClient.cpp @@ -1,8 +1,8 @@ -#include "xmlrpcpp/XmlRpcClient.h" +#include "robot_xmlrpcpp/XmlRpcClient.h" -#include "xmlrpcpp/XmlRpcSocket.h" -#include "xmlrpcpp/XmlRpc.h" +#include "robot_xmlrpcpp/XmlRpcSocket.h" +#include "robot_xmlrpcpp/XmlRpc.h" #include #include diff --git a/src/XmlRpcDispatch.cpp b/src/XmlRpcDispatch.cpp index 8563e5c..5f72bbf 100644 --- a/src/XmlRpcDispatch.cpp +++ b/src/XmlRpcDispatch.cpp @@ -1,7 +1,7 @@ -#include "xmlrpcpp/XmlRpcDispatch.h" -#include "xmlrpcpp/XmlRpcSource.h" -#include "xmlrpcpp/XmlRpcUtil.h" +#include "robot_xmlrpcpp/XmlRpcDispatch.h" +#include "robot_xmlrpcpp/XmlRpcSource.h" +#include "robot_xmlrpcpp/XmlRpcUtil.h" #include #include diff --git a/src/XmlRpcServer.cpp b/src/XmlRpcServer.cpp index 0affb67..6f9a238 100644 --- a/src/XmlRpcServer.cpp +++ b/src/XmlRpcServer.cpp @@ -1,10 +1,10 @@ -#include "xmlrpcpp/XmlRpcServer.h" -#include "xmlrpcpp/XmlRpcServerConnection.h" -#include "xmlrpcpp/XmlRpcServerMethod.h" -#include "xmlrpcpp/XmlRpcSocket.h" -#include "xmlrpcpp/XmlRpcUtil.h" -#include "xmlrpcpp/XmlRpcException.h" +#include "robot_xmlrpcpp/XmlRpcServer.h" +#include "robot_xmlrpcpp/XmlRpcServerConnection.h" +#include "robot_xmlrpcpp/XmlRpcServerMethod.h" +#include "robot_xmlrpcpp/XmlRpcSocket.h" +#include "robot_xmlrpcpp/XmlRpcUtil.h" +#include "robot_xmlrpcpp/XmlRpcException.h" using namespace robot::XmlRpc; diff --git a/src/XmlRpcServerConnection.cpp b/src/XmlRpcServerConnection.cpp index 67ed98d..4386e72 100644 --- a/src/XmlRpcServerConnection.cpp +++ b/src/XmlRpcServerConnection.cpp @@ -1,8 +1,8 @@ -#include "xmlrpcpp/XmlRpcServerConnection.h" +#include "robot_xmlrpcpp/XmlRpcServerConnection.h" -#include "xmlrpcpp/XmlRpcSocket.h" -#include "xmlrpcpp/XmlRpc.h" +#include "robot_xmlrpcpp/XmlRpcSocket.h" +#include "robot_xmlrpcpp/XmlRpc.h" #ifndef MAKEDEPEND # include # include diff --git a/src/XmlRpcServerMethod.cpp b/src/XmlRpcServerMethod.cpp index 4d6ad9f..23aba8b 100644 --- a/src/XmlRpcServerMethod.cpp +++ b/src/XmlRpcServerMethod.cpp @@ -1,6 +1,6 @@ -#include "xmlrpcpp/XmlRpcServerMethod.h" -#include "xmlrpcpp/XmlRpcServer.h" +#include "robot_xmlrpcpp/XmlRpcServerMethod.h" +#include "robot_xmlrpcpp/XmlRpcServer.h" namespace robot { namespace XmlRpc { diff --git a/src/XmlRpcSocket.cpp b/src/XmlRpcSocket.cpp index 04997ec..a47d8bd 100644 --- a/src/XmlRpcSocket.cpp +++ b/src/XmlRpcSocket.cpp @@ -1,6 +1,6 @@ -#include "xmlrpcpp/XmlRpcSocket.h" -#include "xmlrpcpp/XmlRpcUtil.h" +#include "robot_xmlrpcpp/XmlRpcSocket.h" +#include "robot_xmlrpcpp/XmlRpcUtil.h" #ifndef MAKEDEPEND diff --git a/src/XmlRpcSource.cpp b/src/XmlRpcSource.cpp index 4e1f10b..0977e41 100644 --- a/src/XmlRpcSource.cpp +++ b/src/XmlRpcSource.cpp @@ -1,7 +1,7 @@ -#include "xmlrpcpp/XmlRpcSource.h" -#include "xmlrpcpp/XmlRpcSocket.h" -#include "xmlrpcpp/XmlRpcUtil.h" +#include "robot_xmlrpcpp/XmlRpcSource.h" +#include "robot_xmlrpcpp/XmlRpcSocket.h" +#include "robot_xmlrpcpp/XmlRpcUtil.h" namespace robot { namespace XmlRpc { diff --git a/src/XmlRpcUtil.cpp b/src/XmlRpcUtil.cpp index e4f4a02..c9566e5 100644 --- a/src/XmlRpcUtil.cpp +++ b/src/XmlRpcUtil.cpp @@ -1,5 +1,5 @@ -#include "xmlrpcpp/XmlRpcUtil.h" +#include "robot_xmlrpcpp/XmlRpcUtil.h" #ifndef MAKEDEPEND # include @@ -9,7 +9,7 @@ # include #endif -#include "xmlrpcpp/XmlRpc.h" +#include "robot_xmlrpcpp/XmlRpc.h" using namespace robot::XmlRpc; diff --git a/src/XmlRpcValue.cpp b/src/XmlRpcValue.cpp index f07f966..e3ca4e6 100644 --- a/src/XmlRpcValue.cpp +++ b/src/XmlRpcValue.cpp @@ -1,8 +1,8 @@ -#include "xmlrpcpp/XmlRpcValue.h" -#include "xmlrpcpp/XmlRpcException.h" -#include "xmlrpcpp/XmlRpcUtil.h" -#include "xmlrpcpp/base64.h" +#include "robot_xmlrpcpp/XmlRpcValue.h" +#include "robot_xmlrpcpp/XmlRpcException.h" +#include "robot_xmlrpcpp/XmlRpcUtil.h" +#include "robot_xmlrpcpp/base64.h" #ifndef MAKEDEPEND # include