Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
879a05ce
Commit
879a05ce
authored
Jan 26, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improve oqgraph boost check to filter out newer boost versions
parent
8ece9de8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
8 deletions
+26
-8
storage/oqgraph/CMakeLists.txt
storage/oqgraph/CMakeLists.txt
+26
-8
No files found.
storage/oqgraph/CMakeLists.txt
View file @
879a05ce
...
...
@@ -11,26 +11,44 @@ IF(MSVC)
SET
(
BOOST_OK 0
)
ELSE
()
SET
(
BOOST_OK 1
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/EHsc"
)
ENDIF
()
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
CHECK_CXX_SOURCE_COMPILES
(
"
#include <boost/config.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
)
ENDIF
()
IF
(
BOOST_OK
)
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
MODULE_ONLY
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment