cleanup after boost mess..

jutanke · Dec 3, 2017 · bb316fe · bb316fe
1 parent a7ad241
commit bb316fe
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 13 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "external/graph"]
 	path = external/graph
 	url = https://github.com/bjoern-andres/graph
-[submodule "external/boost"]
-	path = external/boost
-	url = https://github.com/boostorg/boost.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ if (OPENMP_FOUND)
 endif()
 
 set(Python_ADDITIONAL_VERSIONS 3.5)
-find_package(Boost 1.58.0 COMPONENTS system thread python-py35 numpy graph REQUIRED)
+find_package(Boost 1.63.0 COMPONENTS system thread python-py35 numpy graph REQUIRED)
 SET(Boost_USE_STATIC_LIBS OFF)
 SET(Boost_USE_MULTITHREADED ON)
 SET(Boost_USE_STATIC_RUNTIME OFF)

diff --git a/external/boost b/external/boost
diff --git a/external/enable_boost.sh b/external/enable_boost.sh
diff --git a/prototyping/CMakeLists.txt b/prototyping/CMakeLists.txt
@@ -6,13 +6,7 @@ if (OPENMP_FOUND)
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
 endif()
 
-INCLUDE_DIRECTORIES(../external/graph/include)
-
-set(Python_ADDITIONAL_VERSIONS 3.5)
-find_package(Boost 1.63.0 COMPONENTS system thread graph REQUIRED)
-SET(Boost_USE_STATIC_LIBS OFF)
-SET(Boost_USE_MULTITHREADED ON)
-SET(Boost_USE_STATIC_RUNTIME OFF)
+INCLUDE_DIRECTORIES("../external/graph/include")
 
 set (CMAKE_CXX_STANDARD 11)
 

diff --git a/prototyping/src/solve_graph.cpp b/prototyping/src/solve_graph.cpp
@@ -1,4 +1,5 @@
 #include <iostream>
+
 #include "andres/graph/graph.hxx"
 #include "andres/graph/complete-graph.hxx"
 #include "andres/graph/multicut-lifted/kernighan-lin.hxx"