Merge pull request #3 from jmirabel/devel

Fix compilation issues

CMakeLists.txt

@@ -167,6 +167,5 @@ install(FILES
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/meshes/hyq
   )
 
-  
+PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
 SETUP_PROJECT_FINALIZE()
-

cmake @ 9965dbcd

-Subproject commit d9578712fbc457a528e121bff38ffaa294819686
+Subproject commit 9965dbcd2a37edbc98707573c05512d838e64c10

include/hpp/corbaserver/rbprm/server.hh

@@ -31,7 +31,7 @@ namespace hpp {
     class HPP_RBPRM_CORBA_DLLAPI Server
     {
     public:
-      Server (int argc, char *argv[], bool multiThread = false,
+      Server (int argc, const char *argv[], bool multiThread = false,
           const std::string& poaName = "child");
       ~Server ();
       /// Set planner that will be controlled by server

src/hpp-rbprm-corba.cc

@@ -22,11 +22,10 @@
 typedef hpp::rbprm::Server RbprmServer;
 typedef hpp::corbaServer::Server CorbaServer;
 
-int main (int argc, char* argv [])
+int main (int argc, const char* argv [])
 {
     hpp::core::ProblemSolverPtr_t problemSolver (hpp::core::ProblemSolver::create());
-    CorbaServer corbaServer (problemSolver, argc,
-               const_cast<const char**> (argv), true);
+    CorbaServer corbaServer (problemSolver, argc, argv, true);
     RbprmServer rbprmServer (argc, argv, true, "rbprmChild");
     rbprmServer.setProblemSolver (problemSolver);
 

src/server.cc

@@ -23,7 +23,7 @@
 
 namespace hpp {
   namespace rbprm {
-    Server::Server (int argc, char *argv[], bool multiThread,
+    Server::Server (int argc, const char *argv[], bool multiThread,
             const std::string& poaName) :
       rbprmBuilder_ (new corba::Server <impl::RbprmBuilder>
           (argc, argv, multiThread, poaName)) {}