mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for FindJust.cmake

Browse source 
Make sure that boost is included with consistent config.
This commit is contained in:
Antony T Curtis 2013-02-21 10:36:25 -08:00
parent 694cbb5fb9
commit 86ed2765bb
7 changed files with 65 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/FindJudy.cmake
View file

@ -19,7 +19,7 @@ ELSE (Judy_INCLUDE_DIR AND Judy_LIBRARIES)
SET(Judy_FOUND FALSE)
ENDIF (Judy_INCLUDE_DIR AND Judy_LIBRARIES)
IF (Judy)
IF (Judy_FOUND)
IF (NOT Judy_FIND_QUIETLY)
MESSAGE(STATUS "Found libjudy: ${Judy_LIBRARIES}")
ENDIF (NOT Judy_FIND_QUIETLY)

40
storage/oqgraph/graphcore-config.h Normal file
View file

@ -0,0 +1,40 @@
/* Copyright (C) 2007-2013 Arjen G Lentz & Antony T Curtis for Open Query
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* ======================================================================
Open Query Graph Computation Engine, based on a concept by Arjen Lentz
Mk.II implementation by Antony Curtis & Arjen Lentz
For more information, documentation, support, enhancement engineering,
and non-GPL licensing, see http://openquery.com/graph
or contact graph@openquery.com
For packaged binaries, see http://ourdelta.org
======================================================================
*/
#ifndef oq_graphcore_config_h_
#define oq_graphcore_config_h_
#define BOOST_ALL_NO_LIB 1
#define BOOST_NO_RTTI 1
#define BOOST_NO_TYPEID 1
#ifdef DBUG_OFF
#define NDEBUG 1
#endif
#include <boost/config.hpp>
#endif

1
storage/oqgraph/graphcore-graph.cc
View file

@ -24,5 +24,6 @@
======================================================================
*/
#include "graphcore-config.h"
#include "graphcore-graph.h"

8
storage/oqgraph/graphcore.cc
View file

@ -26,10 +26,7 @@
#include <string.h>
#define BOOST_ALL_NO_LIB 1
#include <boost/config.hpp>
#include "graphcore-config.h"
#include "graphcore-graph.h"
#include <set>
@ -46,12 +43,15 @@
#include "graphcore.h"
#include <boost/unordered_map.hpp>
#include <boost/version.hpp>
using namespace open_query;
using namespace boost;
static const row empty_row = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
extern "C" const char* const oqgraph_boost_version= BOOST_LIB_VERSION;
namespace open_query
{

12
storage/oqgraph/ha_oqgraph.cc
View file

@ -831,6 +831,16 @@ void ha_oqgraph::update_create_info(HA_CREATE_INFO *create_info)
struct st_mysql_storage_engine oqgraph_storage_engine=
{ MYSQL_HANDLERTON_INTERFACE_VERSION };
extern "C" const char* const oqgraph_boost_version;
extern "C" const char* const oqgraph_judy_version;
static struct st_mysql_show_var oqgraph_status[]=
{
{ "OQGraph_Boost_Version", (char*) &oqgraph_boost_version, SHOW_CHAR_PTR },
/*{ "OQGraph_Judy_Version", (char*) &oqgraph_judy_version, SHOW_CHAR_PTR },*/
{ 0, 0 }
};
maria_declare_plugin(oqgraph)
{
MYSQL_STORAGE_ENGINE_PLUGIN,
@ -842,7 +852,7 @@ maria_declare_plugin(oqgraph)
(int (*)(void*)) oqgraph_init, /* Plugin Init */
oqgraph_fini, /* Plugin Deinit */
0x0300, /* Version: 3s.0 */
NULL, /* status variables */
oqgraph_status, /* status variables */
NULL, /* system variables */
"3.0",
MariaDB_PLUGIN_MATURITY_BETA

6
storage/oqgraph/oqgraph_judy.cc
View file

@ -27,6 +27,12 @@
#include "oqgraph_judy.h"
#include <Judy.h>
#ifndef JUDY_LIB_VERSION
#define JUDY_LIB_VERSION "(unknown)"
#endif
extern "C" const char* const oqgraph_judy_version= JUDY_LIB_VERSION;
void open_query::judy_bitset::clear()
{
int rc;

2
storage/oqgraph/oqgraph_thunk.h
View file

@ -31,6 +31,8 @@
#include <string>
#include <utility>
#include "graphcore-config.h"
#include <boost/intrusive_ptr.hpp>
#include <boost/optional.hpp>
#include <boost/unordered_map.hpp>