From 33a60e7fb657b24e55e5cea15c3f533c26f40ab1 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Fri, 30 Dec 2011 11:21:39 +0100 Subject: [PATCH] Fix oqgraph so it can be built on Window as well. Note: to build with -fno-rtti as we currently build the server, boost version 1.45 or later is required. (without -fno-rtti, 1.40 is enough) --- storage/oqgraph/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/storage/oqgraph/CMakeLists.txt b/storage/oqgraph/CMakeLists.txt index 91704d75750..4b8dac20350 100644 --- a/storage/oqgraph/CMakeLists.txt +++ b/storage/oqgraph/CMakeLists.txt @@ -1,14 +1,14 @@ -CHECK_CXX_SOURCE_COMPILES( -"#include -#if BOOST_VERSION >= 104000 -#else -#error oops -#endif -int main() { return 0; }" BOOST_OK) +FIND_PACKAGE(Boost 1.45.0) # we need at least 1.45 if we want -fno-rtti for the server +IF(NOT Boost_FOUND) + RETURN() +ENDIF() +INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS}) # lp:756966 OQGRAPH on Win64 does not compile IF(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8) SET(BOOST_OK 0) +ELSE() + SET(BOOST_OK 1) ENDIF() IF(BOOST_OK)