Commit 2403b264 authored by Robert Ricci's avatar Robert Ricci

Handle new property_list.hpp location in boost

Have I mentioned that I hate it when library developers move their
headers around? Change the location of the property_list.hpp header
to a macro and add a new -DNEWER_BOOT define that swtiches this to
the newer location.

Not automatically detected yet; should be checked in configure.
parent 386a6931
...@@ -31,8 +31,9 @@ OBJS=parse_top.o parse_ptop.o assign.o pclass.o vclass.o score.o \ ...@@ -31,8 +31,9 @@ OBJS=parse_top.o parse_ptop.o assign.o pclass.o vclass.o score.o \
LIBS+= -lm LIBS+= -lm
LDFLAGS+= -pipe -O3 LDFLAGS+= -pipe -O3
CXXFLAGS = -pipe -I/usr/local/include -ftemplate-depth-40 CXXFLAGS = -pipe -I/usr/local/include -ftemplate-depth-40
# For OSX w/ fink # For OSX w/ macports
CXXFLAGS += -I/sw/include CXXFLAGS += -I/opt/local/include
LIBS += -L/opt/local/lib
ifeq ($(HAVE_XERCES),yes) ifeq ($(HAVE_XERCES),yes)
CXXFLAGS += -DWITH_XML CXXFLAGS += -DWITH_XML
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include <boost/property_map.hpp> #include BOOST_PMAP_HEADER
#include <boost/graph/graph_traits.hpp> #include <boost/graph/graph_traits.hpp>
#include <boost/graph/adjacency_list.hpp> #include <boost/graph/adjacency_list.hpp>
#include <boost/graph/dijkstra_shortest_paths.hpp> #include <boost/graph/dijkstra_shortest_paths.hpp>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include <boost/property_map.hpp> #include BOOST_PMAP_HEADER
#include <boost/graph/graph_traits.hpp> #include <boost/graph/graph_traits.hpp>
#include <boost/graph/adjacency_list.hpp> #include <boost/graph/adjacency_list.hpp>
#include <boost/graph/named_function_params.hpp> #include <boost/graph/named_function_params.hpp>
......
...@@ -10,7 +10,7 @@ static const char rcsid[] = "$Id: parse_top.cc,v 1.42 2009-05-20 18:06:08 tarunp ...@@ -10,7 +10,7 @@ static const char rcsid[] = "$Id: parse_top.cc,v 1.42 2009-05-20 18:06:08 tarunp
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include <boost/property_map.hpp> #include BOOST_PMAP_HEADER
#include <boost/graph/graph_traits.hpp> #include <boost/graph/graph_traits.hpp>
#include <boost/graph/adjacency_list.hpp> #include <boost/graph/adjacency_list.hpp>
......
...@@ -12,7 +12,7 @@ static const char rcsid[] = "$Id: parse_vtop_xml.cc,v 1.2 2009-05-20 18:06:08 ta ...@@ -12,7 +12,7 @@ static const char rcsid[] = "$Id: parse_vtop_xml.cc,v 1.2 2009-05-20 18:06:08 ta
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include <boost/property_map.hpp> #include BOOST_PMAP_HEADER
#include <boost/graph/graph_traits.hpp> #include <boost/graph/graph_traits.hpp>
#include <boost/graph/adjacency_list.hpp> #include <boost/graph/adjacency_list.hpp>
......
...@@ -27,7 +27,7 @@ using namespace __gnu_cxx; ...@@ -27,7 +27,7 @@ using namespace __gnu_cxx;
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include <boost/property_map.hpp> #include BOOST_PMAP_HEADER
#include <boost/graph/graph_traits.hpp> #include <boost/graph/graph_traits.hpp>
#include <boost/graph/adjacency_list.hpp> #include <boost/graph/adjacency_list.hpp>
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "common.h" #include "common.h"
#include "delay.h" #include "delay.h"
#include "port.h"
#include <set> #include <set>
#include <list> #include <list>
...@@ -16,9 +17,9 @@ using namespace std; ...@@ -16,9 +17,9 @@ using namespace std;
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include <boost/property_map.hpp> #include BOOST_PMAP_HEADER
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/adjacency_list.hpp> #include <boost/graph/adjacency_list.hpp>
#include <boost/graph/graph_traits.hpp>
using namespace boost; using namespace boost;
#include <string> #include <string>
......
...@@ -43,5 +43,11 @@ using namespace __gnu_cxx; ...@@ -43,5 +43,11 @@ using namespace __gnu_cxx;
#include <slist> #include <slist>
#endif #endif
#ifdef NEWER_BOOST
#define BOOST_PMAP_HEADER <boost/property_map/property_map.hpp>
#else
#define BOOST_PMAP_HEADER <boost/property_map.hpp>
#endif
#else #else
#endif #endif
...@@ -26,7 +26,7 @@ using namespace __gnu_cxx; ...@@ -26,7 +26,7 @@ using namespace __gnu_cxx;
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include <boost/property_map.hpp> #include BOOST_PMAP_HEADER
#include <boost/graph/graph_traits.hpp> #include <boost/graph/graph_traits.hpp>
#include <boost/graph/adjacency_list.hpp> #include <boost/graph/adjacency_list.hpp>
......
...@@ -12,7 +12,7 @@ static const char rcsid[] = "$Id: vclass.cc,v 1.13 2009-05-20 18:06:08 tarunp Ex ...@@ -12,7 +12,7 @@ static const char rcsid[] = "$Id: vclass.cc,v 1.13 2009-05-20 18:06:08 tarunp Ex
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include <boost/property_map.hpp> #include BOOST_PMAP_HEADER
#include <boost/graph/graph_traits.hpp> #include <boost/graph/graph_traits.hpp>
#include <boost/graph/adjacency_list.hpp> #include <boost/graph/adjacency_list.hpp>
......
...@@ -29,7 +29,7 @@ using namespace std; ...@@ -29,7 +29,7 @@ using namespace std;
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include <boost/property_map.hpp> #include BOOST_PMAP_HEADER
#include <boost/graph/graph_traits.hpp> #include <boost/graph/graph_traits.hpp>
#include <boost/graph/adjacency_list.hpp> #include <boost/graph/adjacency_list.hpp>
using namespace boost; using namespace boost;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment