diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-12-30 11:21:39 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-12-30 11:21:39 +0100 |
| commit | 33a60e7fb657b24e55e5cea15c3f533c26f40ab1 (patch) | |
| tree | 7451def8e4e23f0a6ff037f625159280c9b5c312 | |
| parent | e45a6a17022f9b83d4968b0a1a034ab25f2d1123 (diff) | |
| download | mariadb-git-33a60e7fb657b24e55e5cea15c3f533c26f40ab1.tar.gz | |
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)
| -rw-r--r-- | storage/oqgraph/CMakeLists.txt | 14 |
1 files 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 <boost/version.hpp> -#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) |