update if define

CMakeLists.txt

@@ -1,18 +1,4 @@
 cmake_minimum_required(VERSION 3.0.2)
-
-# ========================================================
-# Dual-mode CMakeLists.txt: Supports both Catkin and Standalone CMake
-# ========================================================
-
-# Detect if building with Catkin
-if(DEFINED CATKIN_DEVEL_PREFIX OR DEFINED CATKIN_TOPLEVEL)
-  set(BUILDING_WITH_CATKIN TRUE)
-  message(STATUS "Building robot_xmlrpcpp with Catkin")
-else()
-  set(BUILDING_WITH_CATKIN FALSE)
-  message(STATUS "Building robot_xmlrpcpp with Standalone CMake")
-endif()
-
 project(robot_xmlrpcpp)
 
 ## Compile as C++17
@@ -25,25 +11,21 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 # Find Packages
 # ========================================================
 
+if(DEFINED CATKIN_DEVEL_PREFIX OR DEFINED CATKIN_TOPLEVEL)
+  set(BUILDING_WITH_CATKIN TRUE)
+  message(STATUS "Building robot_xmlrpcpp with Catkin")
+else()
+  set(BUILDING_WITH_CATKIN FALSE)
+  message(STATUS "Building robot_xmlrpcpp with Standalone CMake")
+endif()
+
 if(BUILDING_WITH_CATKIN)
   ## Find catkin macros and libraries
   find_package(catkin REQUIRED)
-endif()
-
-## System dependencies are found with CMake's conventions
-find_package(console_bridge REQUIRED)
-
-# ========================================================
-# Catkin specific configuration
-# ========================================================
-
-if(BUILDING_WITH_CATKIN)
-  ## The catkin_package macro generates cmake config files for your package
   catkin_package(
     INCLUDE_DIRS include
     LIBRARIES robot_xmlrpcpp
-    CATKIN_DEPENDS
+    # CATKIN_DEPENDS 
-    DEPENDS console_bridge
   )
 endif()
 
@@ -52,13 +34,12 @@ endif()
 ###########
 
 ## Specify additional locations of header files
-include_directories(
-  include
-  ${console_bridge_INCLUDE_DIRS}
-)
-
 if(BUILDING_WITH_CATKIN)
   include_directories(${catkin_INCLUDE_DIRS})
+else()
+  include_directories(
+    include
+  )
 endif()
 
 ## Declare a C++ library

include/robot_xmlrpcpp/XmlRpc.h

@@ -1,5 +1,5 @@
-#ifndef _XMLRPC_H_
+#ifndef _ROBOT_XMLRPC_H_
-#define _XMLRPC_H_
+#define _ROBOT_XMLRPC_H_
 //
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 // This library is free software; you can redistribute it and/or
@@ -91,4 +91,4 @@ namespace robot_xmlrpcpp {
 
 } // namespace robot_xmlrpcpp 
 
-#endif // _XMLRPC_H_
+#endif // _ROBOT_XMLRPC_H_

include/robot_xmlrpcpp/XmlRpcClient.h

@@ -1,6 +1,5 @@
-
+#ifndef _ROBOT_XMLRPCCLIENT_H_
-#ifndef _XMLRPCCLIENT_H_
+#define _ROBOT_XMLRPCCLIENT_H_
-#define _XMLRPCCLIENT_H_
 //
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //
@@ -125,4 +124,4 @@ namespace robot_xmlrpcpp {
 
 }	// namespace robot_xmlrpcpp
 
-#endif	// _XMLRPCCLIENT_H_
+#endif	// _ROBOT_XMLRPCCLIENT_H_

include/robot_xmlrpcpp/XmlRpcDispatch.h

@@ -1,7 +1,6 @@
+#ifndef _ROBOT_XMLRPCDISPATCH_H_
+#define _ROBOT_XMLRPCDISPATCH_H_
 
-#ifndef _XMLRPCDISPATCH_H_
-#define _XMLRPCDISPATCH_H_
-//
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //
 #if defined(_MSC_VER)
@@ -85,4 +84,4 @@ namespace robot_xmlrpcpp {
   };
 } // namespace robot_xmlrpcpp 
 
-#endif  // _XMLRPCDISPATCH_H_
+#endif  // _ROBOT_XMLRPCDISPATCH_H_

include/robot_xmlrpcpp/XmlRpcException.h

@@ -1,7 +1,6 @@
+#ifndef _ROBOT_XMLRPCEXCEPTION_H_
+#define _ROBOT_XMLRPCEXCEPTION_H_
 
-#ifndef _XMLRPCEXCEPTION_H_
-#define _XMLRPCEXCEPTION_H_
-//
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //
 #if defined(_MSC_VER)
@@ -39,4 +38,4 @@ namespace robot_xmlrpcpp {
 
 } // namespace robot_xmlrpcpp 
 
-#endif	// _XMLRPCEXCEPTION_H_
+#endif	// _ROBOT_XMLRPCEXCEPTION_H_

include/robot_xmlrpcpp/XmlRpcServer.h

@@ -1,7 +1,6 @@
+#ifndef _ROBOT_XMLRPCSERVER_H_
+#define _ROBOT_XMLRPCSERVER_H_
 
-#ifndef _XMLRPCSERVER_H_
-#define _XMLRPCSERVER_H_
-//
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //
 #if defined(_MSC_VER)
@@ -101,4 +100,4 @@ namespace robot_xmlrpcpp {
   };
 } // namespace robot_xmlrpcpp 
 
-#endif //_XMLRPCSERVER_H_
+#endif //_ROBOT_XMLRPCSERVER_H_

include/robot_xmlrpcpp/XmlRpcServerConnection.h

@@ -1,5 +1,5 @@
-#ifndef _XMLRPCSERVERCONNECTION_H_
+#ifndef _ROBOT_XMLRPCSERVERCONNECTION_H_
-#define _XMLRPCSERVERCONNECTION_H_
+#define _ROBOT_XMLRPCSERVERCONNECTION_H_
 //
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //
@@ -99,4 +99,4 @@ namespace robot_xmlrpcpp {
   };
 } // namespace robot_xmlrpcpp 
 
-#endif // _XMLRPCSERVERCONNECTION_H_
+#endif // _ROBOT_XMLRPCSERVERCONNECTION_H_

include/robot_xmlrpcpp/XmlRpcServerMethod.h

@@ -1,7 +1,6 @@
-
+#ifndef _ROBOT_XMLRPCSERVERMETHOD_H_
-#ifndef _XMLRPCSERVERMETHOD_H_
 #define _XMLRPCSERVERMETHOD_H_
-//
+#define _ROBOT_XMLRPCSERVERMETHOD_H_
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //
 #if defined(_MSC_VER)
@@ -44,4 +43,4 @@ namespace robot_xmlrpcpp {
   };
 } // namespace robot_xmlrpcpp 
 
-#endif // _XMLRPCSERVERMETHOD_H_
+#endif // _ROBOT_XMLRPCSERVERMETHOD_H_

include/robot_xmlrpcpp/XmlRpcSocket.h

@@ -1,5 +1,5 @@
-#ifndef _XMLRPCSOCKET_H_
+#ifndef _ROBOT_XMLRPCSOCKET_H_
-#define _XMLRPCSOCKET_H_
+#define _ROBOT_XMLRPCSOCKET_H_
 //
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //
@@ -66,4 +66,4 @@ namespace robot_xmlrpcpp {
 
 } // namespace robot_xmlrpcpp 
 
-#endif
+#endif // _ROBOT_XMLRPCSOCKET_H_

include/robot_xmlrpcpp/XmlRpcSource.h

@@ -1,6 +1,5 @@
-
+#ifndef _ROBOT_XMLRPCSOURCE_H_
-#ifndef _XMLRPCSOURCE_H_
+#define _ROBOT_XMLRPCSOURCE_H_
-#define _XMLRPCSOURCE_H_
 //
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //
@@ -52,4 +51,4 @@ namespace robot_xmlrpcpp {
   };
 } // namespace robot_xmlrpcpp 
 
-#endif //_XMLRPCSOURCE_H_
+#endif //_ROBOT_XMLRPCSOURCE_H_

include/robot_xmlrpcpp/XmlRpcUtil.h

@@ -1,5 +1,5 @@
-#ifndef _XMLRPCUTIL_H_
+#ifndef _ROBOT_XMLRPCUTIL_H_
-#define _XMLRPCUTIL_H_
+#define _ROBOT_XMLRPCUTIL_H_
 //
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //

include/robot_xmlrpcpp/XmlRpcValue.h

@@ -1,6 +1,5 @@
-
+#ifndef _ROBOT_XMLRPCVALUE_H_
-#ifndef _XMLRPCVALUE_H_
+#define _ROBOT_XMLRPCVALUE_H_
-#define _XMLRPCVALUE_H_
 //
 // XmlRpc++ Copyright (c) 2002-2003 by Chris Morley
 //
@@ -185,5 +184,4 @@ namespace robot_xmlrpcpp {
 
 std::ostream& operator<<(std::ostream& os, robot_xmlrpcpp::XmlRpcValue& v);
 
-
+#endif // _ROBOT_XMLRPCVALUE_H_
-#endif // _XMLRPCVALUE_H_

include/robot_xmlrpcpp/base64.h

@@ -6,8 +6,8 @@
 //
 //
 
-#if !defined(__BASE64_H_INCLUDED__)
+#if !defined(__ROBOT_BASE64_H_INCLUDED__)
-#define __BASE64_H_INCLUDED__ 1
+#define __ROBOT_BASE64_H_INCLUDED__ 1
 
 #ifndef MAKEDEPEND
 # include <iterator>

package.xml

@@ -19,8 +19,4 @@
     
   <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
 
-  <build_depend>libconsole-bridge-dev</build_depend>
-
-  <run_depend>libconsole-bridge-dev</run_depend>
-
 </package>