jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct Boost Dependency for mac osx (boost 1.42) and linux (boost 1.33): 

system component does not exist in boost 1.33


    !!!!! 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 !!!!!!
This commit is contained in:
Damien Dupuis 2010-07-13 07:25:30 +00:00
parent de5152941c
commit d057ce5a8d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vlsisapd/CMakeLists.txt
View File

@ -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)

2
vlsisapd/src/dtr/src/PyDtr.cpp
View File

@ -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