[SCM] Libraries, protocols, and tools to keep robot software modules and devices cleanly decoupled branch, master, updated. upstream/2.3.19-26-gdf2b712

[Daniele E. Domenichelli]

The following commit has been merged in the master branch:
commit 3ecef4e5ede00f767a77c859e000a0c35e14a7f5
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Mon Jul 30 12:27:10 2012 +0200

    Add yarpserversql_static.diff patch

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4ca716d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+yarpserversql_static.diff
diff --git a/debian/patches/yarpserversql_static.diff b/debian/patches/yarpserversql_static.diff
new file mode 100644
index 0000000..d1818c6
--- /dev/null
+++ b/debian/patches/yarpserversql_static.diff
@@ -0,0 +1,21 @@
+# Do not install yarpserversql and make it a static library
+
+--- a/src/yarpserver/CMakeLists.txt
++++ b/src/yarpserver/CMakeLists.txt
+@@ -22,7 +22,7 @@
+   include_directories(${YARP_TREE_INCLUDE_DIRS})
+   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+ 
+-  add_library(yarpserversql ${SQLITE_SOURCE} src/TripleSourceCreator.cpp src/TripleSourceCreator.h src/Triple.h src/TripleSource.h src/SqliteTripleSource.h ${CMAKE_CURRENT_SOURCE_DIR}/src/NameServiceOnTriples.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/NameServiceOnTriples.h ${CMAKE_CURRENT_SOURCE_DIR}/src/Allocator.h ${CMAKE_CURRENT_SOURCE_DIR}/src/AllocatorOnTriples.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/AllocatorOnTriples.h ${CMAKE_CURRENT_SOURCE_DIR}/src/Subscriber.h ${CMAKE_CURRENT_SOURCE_DIR}/src/SubscriberOnSql.h ${CMAKE_CURRENT_SOURCE_DIR}/src/SubscriberOnSql.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/ComposedNameService.h ${CMAKE_CURRENT_SOURCE_DIR}/src/ConnectThread.h ${CMAKE_CURRENT_SOURCE_DIR}/src/ParseName.h ${CMAKE_CURRENT_SOURCE_DIR}/src/ParseName.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/yarpserver3.cpp)
++  add_library(yarpserversql STATIC ${SQLITE_SOURCE} src/TripleSourceCreator.cpp src/TripleSourceCreator.h src/Triple.h src/TripleSource.h src/SqliteTripleSource.h ${CMAKE_CURRENT_SOURCE_DIR}/src/NameServiceOnTriples.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/NameServiceOnTriples.h ${CMAKE_CURRENT_SOURCE_DIR}/src/Allocator.h ${CMAKE_CURRENT_SOURCE_DIR}/src/AllocatorOnTriples.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/AllocatorOnTriples.h ${CMAKE_CURRENT_SOURCE_DIR}/src/Subscriber.h ${CMAKE_CURRENT_SOURCE_DIR}/src/SubscriberOnSql.h ${CMAKE_CURRENT_SOURCE_DIR}/src/SubscriberOnSql.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/ComposedNameService.h ${CMAKE_CURRENT_SOURCE_DIR}/src/ConnectThread.h ${CMAKE_CURRENT_SOURCE_DIR}/src/ParseName.h ${CMAKE_CURRENT_SOURCE_DIR}/src/ParseName.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/yarpserver3.cpp)
+   target_link_libraries(yarpserversql YARP_init YARP_name)
+   if (YARP_USE_SYSTEM_SQLITE)
+     target_link_libraries(yarpserversql sqlite3)
+@@ -38,7 +38,6 @@
+   add_executable(yarpserver ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp)
+   target_link_libraries(yarpserver yarpserversql)
+ 
+-  INSTALL(TARGETS yarpserversql COMPONENT utilities DESTINATION lib)
+   INSTALL(TARGETS yarpserver yarpserver3 COMPONENT utilities DESTINATION bin)
+ 
+   ###############################################################

-- 
Libraries, protocols, and tools to keep robot software modules and devices cleanly decoupled