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

73 lines
2.2 KiB
Text
Raw Normal View History

MDEV-5319 - Request for merge of Oqgraph v3 functionality storage/oqgraph into 10.0
2013-12-11 10:02:12 +01:00
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
MDEV-6248 GUI-friendly cmake options to enable/disable plugins * Introduce a set of PLUGIN_xxx cmake options with values NO, STATIC, DYNAMIC, AUTO, YES (abort if plugin is not compiled) * Deprecate redundant and ambiguous WITH_xxx, WITH_PLUGIN_xxx, WITH_xxx_STORAGE_ENGINE, WITHOUT_xxx, WITHOUT_PLUGIN_xxx, WITHOUT_xxx_STORAGE_ENGINE * Actually check whether a plugin is disabled (DISABLED keyword was always present, but it was ignored until now). * Support conditionally disabled plugins - keyword ONLY_IF * Use ONLY_IF for conditionally skipping plugins, instead of doing MYSQL_ADD_PLUGIN conditionally as before. Because if MYSQL_ADD_PLUGIN isn't done at all, PLUGIN_xxx=YES cannot work.
2014-06-23 12:09:00 +02:00
FUNCTION(CHECK_OQGRAPH)
Post merge fixes
2012-09-30 23:49:46 +02:00
MESSAGE(STATUS "Configuring OQGraph")
MDEV-7224 OQGraph compile error copy the workaround from 5.5
2015-01-19 14:07:29 +01: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)
MDEV-6248 GUI-friendly cmake options to enable/disable plugins * Introduce a set of PLUGIN_xxx cmake options with values NO, STATIC, DYNAMIC, AUTO, YES (abort if plugin is not compiled) * Deprecate redundant and ambiguous WITH_xxx, WITH_PLUGIN_xxx, WITH_xxx_STORAGE_ENGINE, WITHOUT_xxx, WITHOUT_PLUGIN_xxx, WITHOUT_xxx_STORAGE_ENGINE * Actually check whether a plugin is disabled (DISABLED keyword was always present, but it was ignored until now). * Support conditionally disabled plugins - keyword ONLY_IF * Use ONLY_IF for conditionally skipping plugins, instead of doing MYSQL_ADD_PLUGIN conditionally as before. Because if MYSQL_ADD_PLUGIN isn't done at all, PLUGIN_xxx=YES cannot work.
2014-06-23 12:09:00 +02:00
MESSAGE(STATUS "Boost not found. OQGraph will not be compiled")
cmake: don't repeat yourself make repeated cmake runs less verbose: * remove few not very useful MESSAGE's * only run pkg_check_modules() if there's no cached result * only print QQGraph messages on the first run
2015-09-01 22:00:26 +02:00
SET(OQGRAPH_OK 0 CACHE INTERNAL "")
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
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 judy cmake case sensitivity
2013-02-14 19:38:35 +01:00
FIND_PACKAGE(Judy)
IF(NOT Judy_FOUND)
Cleanups: - Updated help for mysql-test-run - Added OQGraph to all cmake error output regarding OQGraph to make it easier to spot problems - Suppressed warning messages from OQGraph - Added test for version_malloc_library variable mysql-test/mysql-test-run.pl: Updated help mysql-test/suite/sys_vars/r/version_malloc_library_basic.result: Added test for version_malloc_library variable mysql-test/suite/sys_vars/t/version_malloc_library_basic.test: Added test for version_malloc_library variable storage/oqgraph/CMakeLists.txt: Added OQGraph to all cmake error output regarding OQGraph to make it easier to spot problems storage/oqgraph/mysql-test/oqgraph/boundary_conditions.result: Suppressed warning messages storage/oqgraph/mysql-test/oqgraph/boundary_conditions.test: Suppressed warning messages storage/oqgraph/mysql-test/oqgraph/invalid_operations.result: Suppressed warning messages storage/oqgraph/mysql-test/oqgraph/invalid_operations.test: Suppressed warning messages storage/oqgraph/mysql-test/oqgraph/isnull.result: Suppressed warning messages storage/oqgraph/mysql-test/oqgraph/isnull.test: Suppressed warning messages storage/oqgraph/mysql-test/oqgraph/regression_1233113.result: Suppressed warning messages storage/oqgraph/mysql-test/oqgraph/regression_1233113.test: Suppressed warning messages storage/oqgraph/mysql-test/oqgraph/regression_drop_after.result: Suppressed warning messages storage/oqgraph/mysql-test/oqgraph/regression_drop_after.test: Suppressed warning messages
2014-01-09 21:01:12 +01:00
MESSAGE(STATUS "Judy not found. OQGraph will not be compiled")
cmake: don't repeat yourself make repeated cmake runs less verbose: * remove few not very useful MESSAGE's * only run pkg_check_modules() if there's no cached result * only print QQGraph messages on the first run
2015-09-01 22:00:26 +02:00
SET(OQGRAPH_OK 0 CACHE INTERNAL "")
MDEV-5319 - Request for merge of Oqgraph v3 functionality storage/oqgraph into 10.0
2013-12-11 10:02:12 +01:00
RETURN()
Post merge fixes
2012-09-30 23:49:46 +02:00
ENDIF()
fix judy cmake case sensitivity
2013-02-14 19:38:35 +01:00
INCLUDE_DIRECTORIES(${Judy_INCLUDE_DIR})
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)
MDEV-3037 - make build work on Windows 64
2014-04-11 13:39:18 +02:00
# # lp:756966 OQGRAPH on Win64 does not compile
# IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
cmake: don't repeat yourself make repeated cmake runs less verbose: * remove few not very useful MESSAGE's * only run pkg_check_modules() if there's no cached result * only print QQGraph messages on the first run
2015-09-01 22:00:26 +02:00
# SET(OQGRAPH_OK 0 CACHE INTERNAL "")
MDEV-3037 - make build work on Windows 64
2014-04-11 13:39:18 +02:00
# ELSE()
cmake: don't repeat yourself make repeated cmake runs less verbose: * remove few not very useful MESSAGE's * only run pkg_check_modules() if there's no cached result * only print QQGraph messages on the first run
2015-09-01 22:00:26 +02:00
SET(OQGRAPH_OK 1 CACHE INTERNAL "")
MDEV-3037 - make build work on Windows 64
2014-04-11 13:39:18 +02:00
# 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
MDEV-8128 cmake fails to detect boost libraries
2015-06-16 23:46:22 +02:00
SET(CMAKE_REQUIRED_INCLUDES "${Boost_INCLUDE_DIRS}")
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
CHECK_CXX_SOURCE_COMPILES(
"
Fixups for OQGraph v3 on MariaDB 10.0
2013-02-11 01:07:55 +01:00
#define BOOST_NO_RTTI 1
#define BOOST_NO_TYPEID 1
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
#include <boost/config.hpp>
#include <boost/property_map/property_map.hpp>
int main() { return 0; }
cmake: don't repeat yourself make repeated cmake runs less verbose: * remove few not very useful MESSAGE's * only run pkg_check_modules() if there's no cached result * only print QQGraph messages on the first run
2015-09-01 22:00:26 +02:00
" OQGRAPH_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()
MDEV-6248 GUI-friendly cmake options to enable/disable plugins * Introduce a set of PLUGIN_xxx cmake options with values NO, STATIC, DYNAMIC, AUTO, YES (abort if plugin is not compiled) * Deprecate redundant and ambiguous WITH_xxx, WITH_PLUGIN_xxx, WITH_xxx_STORAGE_ENGINE, WITHOUT_xxx, WITHOUT_PLUGIN_xxx, WITHOUT_xxx_STORAGE_ENGINE * Actually check whether a plugin is disabled (DISABLED keyword was always present, but it was ignored until now). * Support conditionally disabled plugins - keyword ONLY_IF * Use ONLY_IF for conditionally skipping plugins, instead of doing MYSQL_ADD_PLUGIN conditionally as before. Because if MYSQL_ADD_PLUGIN isn't done at all, PLUGIN_xxx=YES cannot work.
2014-06-23 12:09:00 +02:00
ENDFUNCTION()
cmake: don't repeat yourself make repeated cmake runs less verbose: * remove few not very useful MESSAGE's * only run pkg_check_modules() if there's no cached result * only print QQGraph messages on the first run
2015-09-01 22:00:26 +02:00
IF(NOT DEFINED OQGRAPH_OK)
CHECK_OQGRAPH()
Move MYSQL_ADD_PLUGIN outside of IF(OQGRAPH_OK) condition, otherwise the plugin does not get compiled if cmake is called multiple times.
2016-05-03 15:23:34 +02:00
IF (NOT OQGRAPH_OK)
MESSAGE(STATUS "Requisites for OQGraph not met. OQGraph will not be compiled")
ENDIF()
ENDIF()
IF(NOT OQGRAPH_OK)
RETURN()
cmake: don't repeat yourself make repeated cmake runs less verbose: * remove few not very useful MESSAGE's * only run pkg_check_modules() if there's no cached result * only print QQGraph messages on the first run
2015-09-01 22:00:26 +02:00
ENDIF()
Move MYSQL_ADD_PLUGIN outside of IF(OQGRAPH_OK) condition, otherwise the plugin does not get compiled if cmake is called multiple times.
2016-05-03 15:23:34 +02:00
ADD_DEFINITIONS(-DHAVE_OQGRAPH)
IF(MSVC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
# Fix problem with judy not finding inttypes.h on Windows:
ADD_DEFINITIONS(-DJU_WIN)
ELSE(MSVC)
# Fix lp bug 1221555 with -fpermissive, so that errors in gcc 4.7 become warnings for the time being
STRING(REPLACE "-fno-exceptions" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
remove the forgotten PARENT_SCOPE
2016-05-03 20:13:58 +02:00
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -fno-strict-aliasing -fpermissive")
Move MYSQL_ADD_PLUGIN outside of IF(OQGRAPH_OK) condition, otherwise the plugin does not get compiled if cmake is called multiple times.
2016-05-03 15:23:34 +02:00
ENDIF(MSVC)
ADD_DEFINITIONS(-DBOOST_NO_RTTI=1 -DBOOST_NO_TYPEID=1 -DBOOST_DISABLE_ASSERTS=1)
MYSQL_ADD_PLUGIN(oqgraph ha_oqgraph.cc graphcore.cc graphcore-graph.cc
oqgraph_shim.cc oqgraph_thunk.cc oqgraph_judy.cc
STORAGE_ENGINE
MODULE_ONLY
RECOMPILE_FOR_EMBEDDED
COMPONENT oqgraph-engine
LINK_LIBRARIES ${Judy_LIBRARIES})
Reference in a new issue Copy permalink