From d057ce5a8d6a9dd0256857a5d394eb6c4557876a Mon Sep 17 00:00:00 2001
From: Damien Dupuis <alliance-users@asim.lip6.fr>
Date: Tue, 13 Jul 2010 07:25:30 +0000
Subject: [PATCH]     Correct Boost Dependency for mac osx (boost 1.42) and
 linux (boost 1.33):         system component does not exist in boost 1.33
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

    !!!!! Merci de ne commiter AUCUN changement dans vlsisapd tant que Jean-Paul et moi n'avons pas résolu les problèmes de bibliothèques statiques !!!!!!
---
 vlsisapd/CMakeLists.txt        | 14 +++++++-------
 vlsisapd/src/dtr/src/PyDtr.cpp |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/vlsisapd/CMakeLists.txt b/vlsisapd/CMakeLists.txt
index f7552860..fa1ba006 100644
--- a/vlsisapd/CMakeLists.txt
+++ b/vlsisapd/CMakeLists.txt
@@ -14,13 +14,13 @@ FIND_PACKAGE(PythonSitePackages REQUIRED)
 
 SET(Boost_USE_STATIC_LIBS ON)
 MESSAGE(STATUS "Always uses Boost static libraries.")
-FIND_PACKAGE(Boost 1.32.0 COMPONENTS program_options filesystem system python REQUIRED)
-IF (Boost_FOUND)
-  MESSAGE(STATUS "Found Boost.Python libraries in ${Boost_INCLUDE_DIR} as ${Boost_LIBRARIES}")
-  FIND_PACKAGE(PythonLibs REQUIRED)
-ELSE (Boost_FOUND)
-  MESSAGE(STATUS "Boost.Python libraries were not found")
-ENDIF (Boost_FOUND)
+FIND_PACKAGE(Boost 1.35.0 COMPONENTS program_options filesystem python system)
+IF (NOT Boost_FOUND)
+  FIND_PACKAGE(Boost 1.32.0 COMPONENTS program_options filesystem python REQUIRED)
+ENDIF (NOT Boost_FOUND)
+
+MESSAGE(STATUS "Found Boost.Python ${Boost_LIB_VERSION} libraries in ${Boost_INCLUDE_DIR} as ${Boost_LIBRARIES}.")
+FIND_PACKAGE(PythonLibs REQUIRED)
 
 FIND_PACKAGE(Doxygen)
 
diff --git a/vlsisapd/src/dtr/src/PyDtr.cpp b/vlsisapd/src/dtr/src/PyDtr.cpp
index 0e4e02ac..817f87e7 100644
--- a/vlsisapd/src/dtr/src/PyDtr.cpp
+++ b/vlsisapd/src/dtr/src/PyDtr.cpp
@@ -20,7 +20,7 @@ BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getValueAsString_overloads, getValueAsStr
 // specify that Techno::addRule method has optional arguments
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(addRule_overloads, addRule, 3, 5);
 
-BOOST_PYTHON_MODULE(DTR) {
+BOOST_PYTHON_MODULE(pyDTR) {
     // class DTR::Name
     class_<Name>("Name", init<std::string>())
         .def("getString", &Name::getString, return_value_policy<copy_const_reference>()) // return_value_policy because this method return a refenrce on string