Merge branch '10.0' into merge-wip

This commit is contained in:
Sergei Golubchik 2015-01-31 21:48:47 +01:00
commit 4b21cd21fe
380 changed files with 11406 additions and 2611 deletions

View file

@ -2,7 +2,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
FUNCTION(CHECK_OQGRAPH)
MESSAGE(STATUS "Configuring OQGraph")
FIND_PACKAGE(Boost)
FIND_PACKAGE(Boost 1.40.0)
IF(NOT Boost_FOUND)
MESSAGE(STATUS "Boost not found. OQGraph will not be compiled")
RETURN()