mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
ab3604989c
fix the code to compile with clang. fix warnings too. include/probes_mysql_nodtrace.h: clang++ doesn't like numeric _constants_ being used in || (it suspects that the intention was | ). Boolean constants are ok. sql/hostname.cc: only used in DBUG_ASSERT sql/item.cc: str_to_time and str_to_datetime return bool, not MYSQL_TIMESTAMP_xxx sql/item_func.cc: str_to_datetime_with_warn() returns bool, not MYSQL_TIMESTAMP_xxx storage/cassandra/CMakeLists.txt: CMAKE_CXX_FLAGS can be empty storage/connect/odbconn.cpp: HWND is void* storage/connect/user_connect.h: deprecated on FreeBSD and unused anyway storage/connect/value.cpp: bad characters inside. unused. storage/spider/spd_trx.cc: clang++ warns that memset will also overwrite vtbl. it might be as well a good idea, as it asserts that the object will only be used as a storage. silence the warning.
57 lines
1.7 KiB
CMake
57 lines
1.7 KiB
CMake
# use the first path that has Thrift.h included, if found
|
|
|
|
FIND_PATH(Thrift_INCLUDE_DIRS Thrift.h PATHS
|
|
$ENV{THRIFT_INCLUDE} # environment variable to be used optionally
|
|
${Thrift_INCLUDE_DIR} # this may be set
|
|
/usr/local/include/thrift # list of additional directories to look from
|
|
/opt/local/include/thrift
|
|
/usr/include/thrift
|
|
/opt/include/thrift
|
|
)
|
|
|
|
# Verify that thrift linking library is found
|
|
SET(Thrift_LIB_PATHS ${Thrift_LIB_PATHS} /usr/local/lib /opt/local/lib /opt/lib)
|
|
FIND_LIBRARY(Thrift_LIBS NAMES thrift PATHS ${Thrift_LIB_PATHS} ${Thrift_LIB})
|
|
IF(EXISTS ${Thrift_LIBS})
|
|
GET_FILENAME_COMPONENT(LINK_DIR ${Thrift_LIBS} PATH ABSOLUTE)
|
|
ELSE()
|
|
RETURN()
|
|
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}")
|
|
|
|
SET(CMAKE_REQUIRED_INCLUDES "${Thrift_INCLUDE_DIRS}/..")
|
|
CHECK_CXX_SOURCE_COMPILES(
|
|
"
|
|
#include <thrift/Thrift.h>
|
|
#include <boost/shared_ptr.hpp>
|
|
int main() {
|
|
boost::shared_ptr<char> p(new char(10));
|
|
return 0;
|
|
}
|
|
" CASSANDRASE_OK)
|
|
|
|
IF(CASSANDRASE_OK)
|
|
SET(cassandra_sources
|
|
ha_cassandra.cc
|
|
ha_cassandra.h
|
|
cassandra_se.h
|
|
cassandra_se.cc
|
|
gen-cpp/Cassandra.cpp
|
|
gen-cpp/cassandra_types.h
|
|
gen-cpp/cassandra_types.cpp
|
|
gen-cpp/cassandra_constants.h
|
|
gen-cpp/cassandra_constants.cpp
|
|
gen-cpp/Cassandra.h)
|
|
|
|
LINK_DIRECTORIES(${LINK_DIR})
|
|
|
|
SET(CASSANDRA_DEB_FILES "usr/lib/mysql/plugin/ha_cassandra.so" PARENT_SCOPE)
|
|
|
|
MYSQL_ADD_PLUGIN(cassandra ${cassandra_sources} STORAGE_ENGINE MODULE_ONLY LINK_LIBRARIES thrift COMPONENT cassandra-engine)
|
|
|
|
ENDIF(CASSANDRASE_OK)
|