From 474dd8b449e30b8347af54ce9882c7a52aba7a85 Mon Sep 17 00:00:00 2001 From: Johann Schleier-Smith Date: Sun, 10 Jul 2016 14:50:34 -0700 Subject: [PATCH] reorder includes to fix version conflicts (#250) Thanks for the changes! --- CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fcae0e3d..20ccd7733 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,18 +38,17 @@ else(NOT APPLE) endif(NOT APPLE) find_package(NumPy REQUIRED) +find_package(Boost REQUIRED) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -find_package(Boost) -include_directories(${Boost_INCLUDE_DIRS}) # This was required to find boost for macports - include_directories("${CMAKE_SOURCE_DIR}/include") -include_directories("/usr/local/include") include_directories("${CMAKE_SOURCE_DIR}/thirdparty/grpc/include/") include_directories("${CMAKE_SOURCE_DIR}/thirdparty/grpc/third_party/protobuf/src") include_directories("${PYTHON_INCLUDE_DIRS}") include_directories("${NUMPY_INCLUDE_DIR}") +include_directories("/usr/local/include") +include_directories("${Boost_INCLUDE_DIRS}") set(PROTO_PATH "${CMAKE_SOURCE_DIR}/protos")