Skip to content
Snippets Groups Projects
Commit 613e068e authored by Raphaël Lallement's avatar Raphaël Lallement
Browse files

[msgconnector] Change to v2.4.0

This new version now install a Findmsgconnector.cmake file

See http://trac.laas.fr/git/msgconnector/commit/?id=bfd650f49f94fbf1b024ce1b7b1ced650bfd8c83

But also fixes some issues.

Finally remove the dependency on epoll and use "select" instead.
parent 5706be1c
No related branches found
No related tags found
No related merge requests found
......@@ -3,8 +3,8 @@
#
DISTNAME= msgconnector-${VERSION}
VERSION= 2.3.0
PKGREVISION= 2
VERSION= 2.4.0
PKGREVISION=
CATEGORIES= planning
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=msgconnector/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_OPENROBOTS}msgconnector
......
......@@ -11,6 +11,7 @@ bin/MsgServer
bin/MsgServer-${PKGVERSION}
lib/libmsgconnectorServer.so
lib/libmsgconnectorServer.so.${PKGVERSION}
share/cmake/Modules/Findmsgconnector.cmake
@comment ${PLIST.server}bin/MsgServer
@comment ${PLIST.server}bin/MsgServer-${PKGVERSION}
@comment ${PLIST.server}lib/libmsgconnectorServer.so
......
......@@ -14,14 +14,15 @@ PREFER.msgconnector?= robotpkg
DEPEND_USE+= msgconnector
DEPEND_ABI.msgconnector?= msgconnector>=2.3.0
DEPEND_ABI.msgconnector?= msgconnector>=2.4.0
DEPEND_DIR.msgconnector?= ../../wip/msgconnector
SYSTEM_SEARCH.msgconnector=\
include/msgconnector/msgClient.hh\
lib/libmsgconnectorClient.so\
bin/MsgServer\
lib/pkgconfig/msgconnector.pc
lib/pkgconfig/msgconnector.pc\
share/cmake/Modules/Findmsgconnector.cmake
endif
......
SHA1 (msgconnector-2.3.0.tar.gz) = a369ad41734b7a4325b0adf39d40f50b98c25645
RMD160 (msgconnector-2.3.0.tar.gz) = 50f63240b4e5f1dcb1204d4a4cba3cb2a75666f4
Size (msgconnector-2.3.0.tar.gz) = 18403 bytes
SHA1 (patch-aa) = 9dcc0578334b9484eebac4eda9c1e63f864d0af7
SHA1 (patch-bb) = f7aa6776e7ab02a1336b8f743ada829e55e74ab3
SHA1 (msgconnector-2.4.0.tar.gz) = 97eea6e23e0f70b7eaed92375c8859172e8f3d61
RMD160 (msgconnector-2.4.0.tar.gz) = a8e9ec3706eccc37a09b943d8178cfe0f33870ba
Size (msgconnector-2.4.0.tar.gz) = 19000 bytes
diff --git isocket/iclient.hh isocket/iclient.hh
index f47421c..eefffe4 100644
--- isocket/iclient.hh
+++ isocket/iclient.hh
@@ -4,6 +4,8 @@
#include <sstream>
#include <errno.h>
+#include <sys/socket.h>
+#include <sys/types.h>
#include <netinet/tcp.h>
#include <netdb.h>
#include <unistd.h>
diff --git isocket/iserver.hh isocket/iserver.hh
index 4b5d0a1..cca41f7 100644
--- isocket/iserver.hh
+++ isocket/iserver.hh
@@ -12,6 +12,14 @@
#include <netdb.h>
#include <fcntl.h>
+#ifndef SOL_TCP
+# ifdef IPPROTO_TCP
+# define SOL_TCP IPPROTO_TCP
+# else
+# define SOL_TCP 6
+# endif /* IPPROTO_TCP */
+#endif /* SOL_TCP */
+
#include <imsg.hh>
#include <message.hh>
diff --git server/CMakeLists.txt server/CMakeLists.txt
index 36a1144..817cebd 100644
--- server/CMakeLists.txt
+++ server/CMakeLists.txt
@@ -4,6 +4,11 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../isocket)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../client)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../plugins)
+find_package(Boost 1.34 REQUIRED COMPONENTS)
+if(Boost_FOUND)
+ include_directories(${Boost_INCLUDE_DIRS})
+endif(Boost_FOUND)
+
set(MC_CONNECTOR_S_SRC msgServer.cc)
add_library(msgconnectorServer SHARED ${MC_CONNECTOR_S_SRC})
diff --git CMakeLists.txt CMakeLists.txt
index 73d288f..94488d5 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -84,7 +84,7 @@ ENDIF(COMPILE_BRIDGE_PRINT)
IF(COMPILE_BRIDGE_ORO OR COMPILE_BRIDGE_OPRS)
message(STATUS "looking for boost[regex] libs")
- find_package(Boost 1.34 REQUIRED COMPONENTS regex)
+ find_package(Boost 1.34 REQUIRED COMPONENTS regex system thread)
IF(Boost_FOUND)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment