From bc80fb07ded7abcfb99d368d14e4c5e81a669101 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Thu, 25 Apr 2013 17:12:52 +0400 Subject: ha_cassandra.so and ha_oqgraph.so can be build only if boost is installed on the build machine. So put them into the deb packages optionally. Additionally, fixing cassandra/CMakeLists.txt to work with thrift installed in /opt/local and /opt. It was supposed to work, but did not work actually. Only thrift installed in /usr or /usr/local worked. renamed: debian/dist/Debian/mariadb-server-10.0.files => debian/dist/Debian/mariadb-server-10.0.files.in debian/dist/Ubuntu/mariadb-server-10.0.files => debian/dist/Ubuntu/mariadb-server-10.0.files.in modified: .bzrignore CMakeLists.txt storage/cassandra/CMakeLists.txt storage/cassandra/cassandra_se.cc storage/cassandra/gen-cpp/Cassandra.h storage/cassandra/gen-cpp/cassandra_types.h storage/oqgraph/CMakeLists.txt debian/dist/Debian/mariadb-server-10.0.files.in debian/dist/Ubuntu/mariadb-server-10.0.files.in --- storage/oqgraph/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'storage/oqgraph') diff --git a/storage/oqgraph/CMakeLists.txt b/storage/oqgraph/CMakeLists.txt index 593fced6235..ecb986bf018 100644 --- a/storage/oqgraph/CMakeLists.txt +++ b/storage/oqgraph/CMakeLists.txt @@ -32,6 +32,8 @@ IF(BOOST_OK) STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) ENDIF(MSVC) + SET(OQGRAPH_DEB_FILES "usr/lib/mysql/plugin/ha_oqgraph.so" PARENT_SCOPE) + MYSQL_ADD_PLUGIN(oqgraph ha_oqgraph.cc graphcore.cc STORAGE_ENGINE MODULE_ONLY) ENDIF(BOOST_OK) -- cgit v1.2.1