mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/oqgraph/CMakeLists.txt

37 lines
987 B
Text
Raw Normal View History

MDEV-336 oqgraph 5.5 crashes in buildbot make CMakeLists.txt to detect if the installed boost can be compiled with the installed compile and specified set of compiler options. Background: even sufficiently new Boost cannot be compiled with the sufficiently old gcc in the presence of -fno-rtti
2012-07-31 22:39:33 +02:00
FIND_PACKAGE(Boost 1.40.0)
Fix oqgraph so it can be built on Window as well. Note: to build with -fno-rtti as we currently build the server, boost version 1.45 or later is required. (without -fno-rtti, 1.40 is enough)
2011-12-30 11:21:39 +01:00
IF(NOT Boost_FOUND)
RETURN()
ENDIF()
INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS})
merge with 5.3 sql/sql_insert.cc: CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. ****** CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. sql/sql_table.cc: small cleanup ****** small cleanup
2011-10-19 21:45:18 +02:00
fix oqgraph on MSVC
2012-08-02 23:17:27 +02:00
IF(MSVC)
# lp:756966 OQGRAPH on Win64 does not compile
IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(BOOST_OK 0)
ELSE()
SET(BOOST_OK 1)
ENDIF()
Fix oqgraph so it can be built on Window as well. Note: to build with -fno-rtti as we currently build the server, boost version 1.45 or later is required. (without -fno-rtti, 1.40 is enough)
2011-12-30 11:21:39 +01:00
ELSE()
MDEV-336 oqgraph 5.5 crashes in buildbot make CMakeLists.txt to detect if the installed boost can be compiled with the installed compile and specified set of compiler options. Background: even sufficiently new Boost cannot be compiled with the sufficiently old gcc in the presence of -fno-rtti
2012-07-31 22:39:33 +02:00
# See if that works. On old gcc it'll fail because of -fno-rtti
CHECK_CXX_SOURCE_COMPILES(
"
#include <boost/config.hpp>
#include <boost/property_map/property_map.hpp>
int main() { return 0; }
" BOOST_OK)
merge with 5.3 sql/sql_insert.cc: CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. ****** CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. sql/sql_table.cc: small cleanup ****** small cleanup
2011-10-19 21:45:18 +02:00
ENDIF()
IF(BOOST_OK)
ADD_DEFINITIONS(-DHAVE_OQGRAPH)
IF(MSVC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
fixes for windows
2011-10-21 23:07:13 +02:00
ELSE(MSVC)
MDEV-336 oqgraph 5.5 crashes in buildbot compile oqgraph with -fno-strict-aliasing
2012-08-11 10:31:10 +02:00
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -fno-strict-aliasing")
merge with 5.3 sql/sql_insert.cc: CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. ****** CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. sql/sql_table.cc: small cleanup ****** small cleanup
2011-10-19 21:45:18 +02:00
STRING(REPLACE "-fno-exceptions" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
fixes for windows
2011-10-21 23:07:13 +02:00
ENDIF(MSVC)
merge with 5.3 sql/sql_insert.cc: CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. ****** CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. sql/sql_table.cc: small cleanup ****** small cleanup
2011-10-19 21:45:18 +02:00
MYSQL_ADD_PLUGIN(oqgraph ha_oqgraph.cc graphcore.cc STORAGE_ENGINE
MODULE_ONLY)
ENDIF(BOOST_OK)
Reference in a new issue Copy permalink