diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-29 17:42:51 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-29 17:42:51 +0100 |
| commit | 97d3402b9c2260134d317e743f47c9bb29c27c2e (patch) | |
| tree | 79025d5f456c1268742e32db9cedd111f0dbd76f /storage/cassandra | |
| parent | 0af4b6c6ee2b8a61823478c0a56ebdfa52cae3cc (diff) | |
| download | mariadb-git-97d3402b9c2260134d317e743f47c9bb29c27c2e.tar.gz | |
buildbot fixes for storage/cassandra/CMakeLists.txt
storage/cassandra/CMakeLists.txt:
more thourough CHECK_CXX_SOURCE_COMPILES test, that checks whether
boost::shared_ptr can work with --fno-rtti
don't install anything in INSTALL_SYSCONFDIR, if the latter is unset
Diffstat (limited to 'storage/cassandra')
| -rw-r--r-- | storage/cassandra/CMakeLists.txt | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/storage/cassandra/CMakeLists.txt b/storage/cassandra/CMakeLists.txt index 2fca1803d3c..251cfe65e6b 100644 --- a/storage/cassandra/CMakeLists.txt +++ b/storage/cassandra/CMakeLists.txt @@ -20,10 +20,17 @@ ENDIF() INCLUDE_DIRECTORIES(AFTER ${Thrift_INCLUDE_DIRS}) SET(CMAKE_REQUIRED_INCLUDES ${Thrift_INCLUDE_DIRS}) +STRING(REPLACE "-fno-exceptions" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) +STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) + CHECK_CXX_SOURCE_COMPILES( " #include <Thrift.h> -int main() { return 0; } +#include <boost/shared_ptr.hpp> +int main() { + boost::shared_ptr<char> p(new char(10)); + return 0; +} " CASSANDRASE_OK) IF(CASSANDRASE_OK) @@ -39,11 +46,11 @@ IF(CASSANDRASE_OK) gen-cpp/cassandra_constants.cpp gen-cpp/Cassandra.h) - STRING(REPLACE "-fno-exceptions" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) - STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) LINK_DIRECTORIES(${LINK_DIR}) MYSQL_ADD_PLUGIN(cassandra ${cassandra_sources} STORAGE_ENGINE MODULE_ONLY LINK_LIBRARIES thrift COMPONENT CassandraSE) - INSTALL(FILES cassandra.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d - COMPONENT CassandraSE) + IF (INSTALL_SYSCONFDIR) + INSTALL(FILES cassandra.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d + COMPONENT CassandraSE) + ENDIF(INSTALL_SYSCONFDIR) ENDIF(CASSANDRASE_OK) |