diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-04-10 22:48:28 -0700 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-04-10 22:48:28 -0700 |
| commit | fcd29b78456a47b00763fe249bbee9456bfbf6bb (patch) | |
| tree | 9261b0f6bf4f73c924d9662e051bec838bea3b95 /storage/oqgraph | |
| parent | 7b82d39398d2d625f4b87645d53819305ee6efb4 (diff) | |
| download | mariadb-git-fcd29b78456a47b00763fe249bbee9456bfbf6bb.tar.gz | |
Detect Boost installation and build OQGRAPH when possible. For now, disable oqgraph on x64 until
LPBUG 756966 is solved.
Diffstat (limited to 'storage/oqgraph')
| -rw-r--r-- | storage/oqgraph/CMakeLists.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/storage/oqgraph/CMakeLists.txt b/storage/oqgraph/CMakeLists.txt index d81dbe323b6..1eaec7ea028 100644 --- a/storage/oqgraph/CMakeLists.txt +++ b/storage/oqgraph/CMakeLists.txt @@ -13,6 +13,13 @@ # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+FIND_PACKAGE(Boost)
+
+IF(Boost_FOUND)
+ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+ SET(CMAKE_REQUIRED_INCLUDES ${Boost_INCLUDE_DIRS})
+ENDIF()
+
INCLUDE (CheckCXXSourceCompiles)
CHECK_CXX_SOURCE_COMPILES(
"#include <boost/version.hpp>
@@ -21,8 +28,9 @@ CHECK_CXX_SOURCE_COMPILES( #error oops
#endif
int main() { return 0; }" BOOST_OK)
-
-IF(BOOST_OK)
+
+# Only compile OQGRAPH on 32 bit, 64 bit does not compile yet (LPBUG 756966)
+IF(BOOST_OK AND CMAKE_SIZEOF_VOID_P EQUAL 4)
INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_OQGRAPH /EHsc")
|