[SCM] visp branch, master, updated. debian/2.6.2-1-46-g9141c5c

Thomas Moulard thomas.moulard at gmail.com
Thu Jun 13 02:48:10 UTC 2013


The following commit has been merged in the master branch:
commit d8889e714b1440ffa5a5676ae50fd36ff338f27f
Author: Thomas Moulard <thomas.moulard at gmail.com>
Date:   Thu Jun 13 11:47:03 2013 +0900

    Add patch for Ubuntu Saucy.

diff --git a/debian/patches/0006-Look-for-and-compile-against-Boost.System-in-CMakeLi.patch b/debian/patches/0006-Look-for-and-compile-against-Boost.System-in-CMakeLi.patch
new file mode 100644
index 0000000..e4876ed
--- /dev/null
+++ b/debian/patches/0006-Look-for-and-compile-against-Boost.System-in-CMakeLi.patch
@@ -0,0 +1,26 @@
+From: Thomas Moulard <thomas.moulard at gmail.com>
+Date: Thu, 13 Jun 2013 11:37:13 +0900
+Subject: Look for and compile against Boost.System in CMakeLists.txt.
+
+Look for and compile against Boost.System in CMakeLists.txt.
+
+Author: Thomas Moulard <thomas.moulard at gmail.com>
+Bug: https://gforge.inria.fr/tracker/index.php?func=detail&aid=15896&group_id=397&atid=1867
+Forwarded: yes
+---
+ CMakeLists.txt |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a6810c2..e252aa8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -725,7 +725,7 @@ IF(USE_OGRE)
+     endif ()
+     set(Boost_ADDITIONAL_VERSIONS "1.53.0" "1.52.0" "1.51.0" "1.50.0" "1.49.0" "1.48.0" "1.47.0" "1.46.0" "1.45.0" "1.44.0" "1.44" "1.44.0" "1.42" "1.42.0" "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37" )
+     # Components that need linking (NB does not include header-only components like bind)
+-    set(OGRE_BOOST_COMPONENTS thread date_time)
++    set(OGRE_BOOST_COMPONENTS thread date_time system)
+     find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
+     mark_as_advanced(Boost_LIB_DIAGNOSTIC_DEFINITIONS Boost_DIR)
+     if (NOT Boost_FOUND)
diff --git a/debian/patches/series b/debian/patches/series
index 9a64ce3..1354d82 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Fix-cppcheck-errors.patch
 0004-Install-vpConfig.h-in-include-architecture-triplet.patch
 0005-Fix-CMake-files-to-support-multiarch.patch
+0006-Look-for-and-compile-against-Boost.System-in-CMakeLi.patch

-- 
visp



More information about the debian-science-commits mailing list