[Performous-commit] Lasse Karkkainen : Update libda to Boost 1.36 (avoiding compile warnings).

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: 6c6b7b1529d60ee362fde3141a709130a1298994

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed Nov 11 22:14:47 2009 +0200

Update libda to Boost 1.36 (avoiding compile warnings).
Add CMake policy for version 2.6 (to avoid CMake warnings).

---

 CMakeLists.txt                        |    1 +
 libs/libda/CMakeLists.txt             |    1 +
 libs/libda/plugins/CMakeLists.txt     |    2 +-
 libs/libda/plugins/audio_dev_tone.cpp |    5 ++---
 libs/plugin++/CMakeLists.txt          |    1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad4d399..e48ac49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 project(Performous CXX)
 cmake_minimum_required(VERSION 2.6)
+cmake_policy(VERSION 2.6)
 set(PROJECT_VERSION "0.4-pre5")
 
 # Avoid source tree pollution
diff --git a/libs/libda/CMakeLists.txt b/libs/libda/CMakeLists.txt
index 3ecbe27..f10c47c 100644
--- a/libs/libda/CMakeLists.txt
+++ b/libs/libda/CMakeLists.txt
@@ -1,5 +1,6 @@
 project(libda)
 cmake_minimum_required(VERSION 2.6)
+cmake_policy(VERSION 2.6)
 
 set(LIBDA_PLUGIN_DIR "lib${LIB_SUFFIX}/libda")
 
diff --git a/libs/libda/plugins/CMakeLists.txt b/libs/libda/plugins/CMakeLists.txt
index fb21655..1c32364 100644
--- a/libs/libda/plugins/CMakeLists.txt
+++ b/libs/libda/plugins/CMakeLists.txt
@@ -98,7 +98,7 @@ endif(LIBDA_PLUGIN_PULSE)
 if(LIBDA_PLUGIN_TESTING)
 	set(Boost_USE_STATIC_LIBS ON)
 	set(Boost_USE_MULTITHREAD ON)
-	find_package(Boost 1.34 REQUIRED COMPONENTS thread date_time)
+	find_package(Boost 1.36 REQUIRED COMPONENTS thread date_time)
 	if(Boost_FOUND)
 		set(PLUGIN_TESTING_DESC "enabled")
 		set(PLUGIN_TESTING true)
diff --git a/libs/libda/plugins/audio_dev_tone.cpp b/libs/libda/plugins/audio_dev_tone.cpp
index b126e8d..b715573 100644
--- a/libs/libda/plugins/audio_dev_tone.cpp
+++ b/libs/libda/plugins/audio_dev_tone.cpp
@@ -2,8 +2,7 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/lambda/bind.hpp>
-// Needs at least Boost 1.36 and many systems don't have that: #include <boost/spirit/include/classic_core.hpp>
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/classic_core.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/xtime.hpp>
 #include <algorithm>
@@ -60,7 +59,7 @@ namespace {
 		boost::xtime time;
 		void add(std::string const& tonestr) {
 			double freq = 440.0, amplitude = 0.1, phase = 0.0;
-			using namespace boost::spirit; //::classic;
+			using namespace boost::spirit::classic;
 			using namespace boost::lambda;
 			placeholder1_type arg1;
 			if (!parse(tonestr.c_str(),
diff --git a/libs/plugin++/CMakeLists.txt b/libs/plugin++/CMakeLists.txt
index 76494e7..639e139 100644
--- a/libs/plugin++/CMakeLists.txt
+++ b/libs/plugin++/CMakeLists.txt
@@ -1,5 +1,6 @@
 project(Plugin++)
 cmake_minimum_required(VERSION 2.4)
+cmake_policy(VERSION 2.6)
 
 include_directories(include)