Skip to content

Commit

Permalink
reorder includes to fix version conflicts (ray-project#250)
Browse files Browse the repository at this point in the history
Thanks for the changes!
  • Loading branch information
Johann Schleier-Smith authored and pcmoritz committed Jul 10, 2016
1 parent 02c7784 commit 474dd8b
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down

0 comments on commit 474dd8b

Please sign in to comment.