diff options
| author | Alexander Barkov <bar@mariadb.org> | 2013-04-25 17:12:52 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2013-04-25 17:12:52 +0400 |
| commit | bc80fb07ded7abcfb99d368d14e4c5e81a669101 (patch) | |
| tree | 4ad02b3ecbc9d357c7d6a18c55e97103da1d0eb4 /storage/oqgraph | |
| parent | 616e7a7466d2a9bceec9b2c968ce5cbf8035eba4 (diff) | |
| download | mariadb-git-bc80fb07ded7abcfb99d368d14e4c5e81a669101.tar.gz | |
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
Diffstat (limited to 'storage/oqgraph')
| -rw-r--r-- | storage/oqgraph/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
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) |