Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Tiago Peixoto
graph-tool
Commits
461ed63c
Commit
461ed63c
authored
May 06, 2012
by
Tiago Peixoto
Browse files
Fix bug with run_action()
This install the boost workaround headers together with graph_tool's header files.
parent
807fc3ae
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/graph/Makefile.am
View file @
461ed63c
...
...
@@ -18,16 +18,6 @@ libgraph_tool_coredir = $(pythondir)/graph_tool
libgraph_tool_core_LTLIBRARIES
=
libgraph_tool_core.la
libgraph_tool_core_la_SOURCES
=
\
../boost-workaround/boost/graph/betweenness_centrality.hpp
\
../boost-workaround/boost/graph/detail/read_graphviz_new.hpp
\
../boost-workaround/boost/graph/graphml.hpp
\
../boost-workaround/boost/graph/graphviz.hpp
\
../boost-workaround/boost/graph/isomorphism.hpp
\
../boost-workaround/boost/graph/kamada_kawai_spring_layout.hpp
\
../boost-workaround/boost/graph/overloading.hpp
\
../boost-workaround/boost/graph/push_relabel_max_flow.hpp
\
../boost-workaround/boost/graph/copy_alt.hpp
\
../boost-workaround/boost/graph/reverse_graph_alt.hpp
\
graph.cc
\
graph_bind.cc
\
graph_copy.cc
\
...
...
@@ -64,6 +54,19 @@ libgraph_tool_core_la_include_HEADERS = \
str_repr.hh
\
shared_map.hh
libgraph_tool_core_la_workarounddir
=
$(pythondir)
/graph_tool/include/boost-workaround/boost/graph/
libgraph_tool_core_la_workaround_HEADERS
=
\
../boost-workaround/boost/graph/betweenness_centrality.hpp
\
../boost-workaround/boost/graph/detail/read_graphviz_new.hpp
\
../boost-workaround/boost/graph/graphml.hpp
\
../boost-workaround/boost/graph/graphviz.hpp
\
../boost-workaround/boost/graph/isomorphism.hpp
\
../boost-workaround/boost/graph/kamada_kawai_spring_layout.hpp
\
../boost-workaround/boost/graph/overloading.hpp
\
../boost-workaround/boost/graph/push_relabel_max_flow.hpp
\
../boost-workaround/boost/graph/copy_alt.hpp
\
../boost-workaround/boost/graph/reverse_graph_alt.hpp
libgraph_tool_core_la_LIBADD
=
$(MOD_LIBADD)
libgraph_tool_core_la_LDFLAGS
=
$(MOD_LDFLAGS)
src/graph_tool/run_action/inline.py
View file @
461ed63c
...
...
@@ -39,7 +39,8 @@ for d in [p + "/graph_tool" for p in sys_path]:
break
inc_prefix
=
prefix
+
"/include"
cxxflags
=
libgraph_tool_core
.
mod_info
().
cxxflags
+
" -I%s"
%
inc_prefix
cxxflags
=
libgraph_tool_core
.
mod_info
().
cxxflags
+
" -I%s"
%
inc_prefix
+
\
" -I%s"
%
inc_prefix
+
"/boost-workaround"
# this is the code template which defines the action function object
support_template
=
open
(
prefix
+
"/run_action/run_action_support.hh"
).
read
()
...
...
@@ -47,8 +48,14 @@ code_template = open(prefix + "/run_action/run_action_template.hh").read()
# hash all the headers to force recompilation if code changes
headers_hash
=
""
for
inc
in
glob
.
glob
(
inc_prefix
+
"/*"
):
headers_hash
=
hashlib
.
md5
(
headers_hash
+
open
(
inc
).
read
()).
hexdigest
()
incs
=
glob
.
glob
(
inc_prefix
+
"/*"
)
while
len
(
incs
)
>
0
:
inc
=
incs
[
0
]
del
incs
[
0
]
if
os
.
path
.
isdir
(
inc
):
incs
+=
glob
.
glob
(
inc
+
"/*"
)
else
:
headers_hash
=
hashlib
.
md5
(
headers_hash
+
open
(
inc
).
read
()).
hexdigest
()
# property map types
props
=
"""
...
...
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