1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve oqgraph boost check to filter out newer boost versions

Browse Source
This commit is contained in:
Sergei Golubchik 2014-01-26 21:49:39 +01:00
parent 8ece9de833
commit 879a05ce3f
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
storage/oqgraph/CMakeLists.txt
View File

@ -11,26 +11,44 @@ IF(MSVC)
SET(BOOST_OK 0) SET(BOOST_OK 0)
ELSE() ELSE()
SET(BOOST_OK 1) SET(BOOST_OK 1)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
ENDIF() ENDIF()
ELSE() ELSE()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -fno-strict-aliasing")
STRING(REPLACE "-fno-exceptions" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
# See if that works. On old gcc it'll fail because of -fno-rtti # See if that works. On old gcc it'll fail because of -fno-rtti
CHECK_CXX_SOURCE_COMPILES( CHECK_CXX_SOURCE_COMPILES(
" "
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/property_map/property_map.hpp> #include <boost/property_map/property_map.hpp>
int main() { return 0; } #include <boost/graph/adjacency_list.hpp>
using namespace boost;
struct VertexInfo { int id; };
namespace boost
{
namespace graph
{
template<> struct internal_vertex_name<VertexInfo>
{ typedef multi_index::member<VertexInfo, int , &VertexInfo::id> type; };
}
}
typedef adjacency_list<vecS, vecS, bidirectionalS, VertexInfo> Graph;
int main()
{
graph_traits<Graph>::vertex_descriptor *orig;
Graph *g;
remove_vertex(*orig, *g);
return 0;
}
" BOOST_OK) " BOOST_OK)
ENDIF() ENDIF()
IF(BOOST_OK) IF(BOOST_OK)
ADD_DEFINITIONS(-DHAVE_OQGRAPH) ADD_DEFINITIONS(-DHAVE_OQGRAPH)
IF(MSVC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
ELSE(MSVC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -fno-strict-aliasing")
STRING(REPLACE "-fno-exceptions" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
ENDIF(MSVC)
MYSQL_ADD_PLUGIN(oqgraph ha_oqgraph.cc graphcore.cc STORAGE_ENGINE MYSQL_ADD_PLUGIN(oqgraph ha_oqgraph.cc graphcore.cc STORAGE_ENGINE
MODULE_ONLY) MODULE_ONLY)