Skip to content

Commit 50e90d2

Browse files
jeremy-murphyjeremy-murphy
committed
Revert "Merge pull request #392 from jeremy-murphy/CMake"
This reverts commit 35e20c2, reversing changes made to dde65fe.
1 parent 35e20c2 commit 50e90d2

2 files changed

Lines changed: 2 additions & 332 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 2 additions & 176 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
# Distributed under the Boost Software License, Version 1.0.
33
# https://www.boost.org/LICENSE_1_0.txt
44

5-
if (NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
6-
7-
# When we're part of the Boost super project.
85
cmake_minimum_required(VERSION 3.8...3.16)
96

107
project(boost_graph VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
@@ -14,6 +11,8 @@ add_library(boost_graph
1411
src/read_graphviz_new.cpp
1512
)
1613

14+
add_library(Boost::graph ALIAS boost_graph)
15+
1716
target_include_directories(boost_graph PUBLIC include)
1817

1918
target_link_libraries(boost_graph
@@ -67,179 +66,6 @@ target_compile_definitions(boost_graph
6766
# PRIVATE BOOST_GRAPH_SOURCE
6867
)
6968

70-
else()
71-
# When we're worked on by Boost.Graph developers.
72-
# Using 3.29 for now until I figure out the differences with the new Boost
73-
# config cmake introduced in 3.30.
74-
cmake_minimum_required(VERSION 3.29)
75-
project(boost_graph VERSION 1.0.0 LANGUAGES CXX)
76-
77-
set(CMAKE_CXX_STANDARD 14)
78-
79-
# TODO: The super-project version is set explicitly just like this, but we
80-
# should parse it from boost/version.hpp.
81-
find_package(Boost 1.90.0 REQUIRED COMPONENTS regex)
82-
83-
add_library(boost_graph)
84-
target_sources(boost_graph PUBLIC
85-
FILE_SET HEADERS
86-
BASE_DIRS "include"
87-
FILES
88-
include/boost/graph/adj_list_serialize.hpp
89-
include/boost/graph/adjacency_iterator.hpp
90-
include/boost/graph/adjacency_list.hpp
91-
include/boost/graph/adjacency_list_io.hpp
92-
include/boost/graph/adjacency_matrix.hpp
93-
include/boost/graph/astar_search.hpp
94-
include/boost/graph/bandwidth.hpp
95-
include/boost/graph/bc_clustering.hpp
96-
include/boost/graph/bellman_ford_shortest_paths.hpp
97-
include/boost/graph/betweenness_centrality.hpp
98-
include/boost/graph/biconnected_components.hpp
99-
include/boost/graph/bipartite.hpp
100-
include/boost/graph/boyer_myrvold_planar_test.hpp
101-
include/boost/graph/boykov_kolmogorov_max_flow.hpp
102-
include/boost/graph/breadth_first_search.hpp
103-
include/boost/graph/bron_kerbosch_all_cliques.hpp
104-
include/boost/graph/buffer_concepts.hpp
105-
include/boost/graph/chrobak_payne_drawing.hpp
106-
include/boost/graph/circle_layout.hpp
107-
include/boost/graph/closeness_centrality.hpp
108-
include/boost/graph/clustering_coefficient.hpp
109-
include/boost/graph/compressed_sparse_row_graph.hpp
110-
include/boost/graph/connected_components.hpp
111-
include/boost/graph/copy.hpp
112-
include/boost/graph/core_numbers.hpp
113-
include/boost/graph/create_condensation_graph.hpp
114-
include/boost/graph/cuthill_mckee_ordering.hpp
115-
include/boost/graph/cycle_canceling.hpp
116-
include/boost/graph/dag_shortest_paths.hpp
117-
include/boost/graph/degree_centrality.hpp
118-
include/boost/graph/depth_first_search.hpp
119-
include/boost/graph/dijkstra_shortest_paths.hpp
120-
include/boost/graph/dijkstra_shortest_paths_no_color_map.hpp
121-
include/boost/graph/dimacs.hpp
122-
include/boost/graph/directed_graph.hpp
123-
include/boost/graph/dll_import_export.hpp
124-
include/boost/graph/dominator_tree.hpp
125-
include/boost/graph/eccentricity.hpp
126-
include/boost/graph/edge_coloring.hpp
127-
include/boost/graph/edge_connectivity.hpp
128-
include/boost/graph/edge_list.hpp
129-
include/boost/graph/edmonds_karp_max_flow.hpp
130-
include/boost/graph/edmunds_karp_max_flow.hpp
131-
include/boost/graph/erdos_renyi_generator.hpp
132-
include/boost/graph/exception.hpp
133-
include/boost/graph/exterior_property.hpp
134-
include/boost/graph/filtered_graph.hpp
135-
include/boost/graph/find_flow_cost.hpp
136-
include/boost/graph/floyd_warshall_shortest.hpp
137-
include/boost/graph/fruchterman_reingold.hpp
138-
include/boost/graph/geodesic_distance.hpp
139-
include/boost/graph/graph_archetypes.hpp
140-
include/boost/graph/graph_as_tree.hpp
141-
include/boost/graph/graph_concepts.hpp
142-
include/boost/graph/graph_mutability_traits.hpp
143-
include/boost/graph/graph_selectors.hpp
144-
include/boost/graph/graph_stats.hpp
145-
include/boost/graph/graph_traits.hpp
146-
include/boost/graph/graph_utility.hpp
147-
include/boost/graph/graphml.hpp
148-
include/boost/graph/graphviz.hpp
149-
include/boost/graph/grid_graph.hpp
150-
include/boost/graph/gursoy_atun_layout.hpp
151-
include/boost/graph/hawick_circuits.hpp
152-
include/boost/graph/howard_cycle_ratio.hpp
153-
include/boost/graph/incremental_components.hpp
154-
include/boost/graph/is_kuratowski_subgraph.hpp
155-
include/boost/graph/is_straight_line_drawing.hpp
156-
include/boost/graph/isomorphism.hpp
157-
include/boost/graph/iteration_macros.hpp
158-
include/boost/graph/iteration_macros_undef.hpp
159-
include/boost/graph/johnson_all_pairs_shortest.hpp
160-
include/boost/graph/kamada_kawai_spring_layout.hpp
161-
include/boost/graph/king_ordering.hpp
162-
include/boost/graph/kruskal_min_spanning_tree.hpp
163-
include/boost/graph/labeled_graph.hpp
164-
include/boost/graph/leda_graph.hpp
165-
include/boost/graph/lookup_edge.hpp
166-
include/boost/graph/loop_erased_random_walk.hpp
167-
include/boost/graph/make_biconnected_planar.hpp
168-
include/boost/graph/make_connected.hpp
169-
include/boost/graph/make_maximal_planar.hpp
170-
include/boost/graph/matrix_as_graph.hpp
171-
include/boost/graph/max_cardinality_matching.hpp
172-
include/boost/graph/maximum_adjacency_search.hpp
173-
include/boost/graph/maximum_weighted_matching.hpp
174-
include/boost/graph/mcgregor_common_subgraphs.hpp
175-
include/boost/graph/mesh_graph_generator.hpp
176-
include/boost/graph/metis.hpp
177-
include/boost/graph/metric_tsp_approx.hpp
178-
include/boost/graph/minimum_degree_ordering.hpp
179-
include/boost/graph/named_function_params.hpp
180-
include/boost/graph/named_graph.hpp
181-
include/boost/graph/neighbor_bfs.hpp
182-
include/boost/graph/numeric_values.hpp
183-
include/boost/graph/one_bit_color_map.hpp
184-
include/boost/graph/overloading.hpp
185-
include/boost/graph/page_rank.hpp
186-
include/boost/graph/planar_canonical_ordering.hpp
187-
include/boost/graph/planar_face_traversal.hpp
188-
include/boost/graph/plod_generator.hpp
189-
include/boost/graph/point_traits.hpp
190-
include/boost/graph/prim_minimum_spanning_tree.hpp
191-
include/boost/graph/profile.hpp
192-
include/boost/graph/properties.hpp
193-
include/boost/graph/property_iter_range.hpp
194-
include/boost/graph/push_relabel_max_flow.hpp
195-
include/boost/graph/r_c_shortest_paths.hpp
196-
include/boost/graph/random.hpp
197-
include/boost/graph/random_layout.hpp
198-
include/boost/graph/random_spanning_tree.hpp
199-
include/boost/graph/read_dimacs.hpp
200-
include/boost/graph/relax.hpp
201-
include/boost/graph/reverse_graph.hpp
202-
include/boost/graph/rmat_graph_generator.hpp
203-
include/boost/graph/sequential_vertex_coloring.hpp
204-
include/boost/graph/simple_point.hpp
205-
include/boost/graph/sloan_ordering.hpp
206-
include/boost/graph/small_world_generator.hpp
207-
include/boost/graph/smallest_last_ordering.hpp
208-
include/boost/graph/ssca_graph_generator.hpp
209-
include/boost/graph/st_connected.hpp
210-
include/boost/graph/stanford_graph.hpp
211-
include/boost/graph/stoer_wagner_min_cut.hpp
212-
include/boost/graph/strong_components.hpp
213-
include/boost/graph/subgraph.hpp
214-
include/boost/graph/successive_shortest_path_nonnegative_weights.hpp
215-
include/boost/graph/tiernan_all_cycles.hpp
216-
include/boost/graph/topological_sort.hpp
217-
include/boost/graph/topology.hpp
218-
include/boost/graph/transitive_closure.hpp
219-
include/boost/graph/transitive_reduction.hpp
220-
include/boost/graph/transpose_graph.hpp
221-
include/boost/graph/tree_traits.hpp
222-
include/boost/graph/two_bit_color_map.hpp
223-
include/boost/graph/two_graphs_common_spanning_trees.hpp
224-
include/boost/graph/undirected_dfs.hpp
225-
include/boost/graph/undirected_graph.hpp
226-
include/boost/graph/use_mpi.hpp
227-
include/boost/graph/vector_as_graph.hpp
228-
include/boost/graph/vertex_and_edge_range.hpp
229-
include/boost/graph/vf2_sub_graph_iso.hpp
230-
include/boost/graph/visitors.hpp
231-
include/boost/graph/wavefront.hpp
232-
include/boost/graph/write_dimacs.hpp
233-
PRIVATE
234-
src/graphml.cpp
235-
src/read_graphviz_new.cpp
236-
)
237-
target_link_libraries(boost_graph PUBLIC Boost::headers PRIVATE Boost::regex)
238-
include(CTest)
239-
endif()
240-
241-
add_library(Boost::graph ALIAS boost_graph)
242-
24369
if(BUILD_SHARED_LIBS)
24470
target_compile_definitions(boost_graph PUBLIC BOOST_GRAPH_DYN_LINK)
24571
else()

‎test/CMakeLists.txt‎

Lines changed: 0 additions & 156 deletions
This file was deleted.

0 commit comments

Comments
 (0)