Skip to content

Commit

Permalink
Merge pull request #72 from jcarpent/devel
Browse files Browse the repository at this point in the history
Sync submodule cmake and use SYSTEM option
  • Loading branch information
jcarpent authored Aug 5, 2019
2 parents 7532f7b + e33ecee commit 4011a90
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ ENDIF(APPLE)
setup_hpp_project()

add_required_dependency("eigen3 >= 3.0.0")
include_directories(${EIGEN3_INCLUDE_DIRS})
include_directories(SYSTEM ${EIGEN3_INCLUDE_DIRS})

# Add a cache variable to allow not compiling and running tests
set (RUN_TESTS TRUE CACHE BOOL "compile and run unit tests")
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ set(${LIBRARY_NAME}_SOURCES
)

# Declare boost include directories
include_directories(${Boost_INCLUDE_DIRS})
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})

add_library(${LIBRARY_NAME}
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ macro(add_fcl_test test_name)
endmacro(add_fcl_test)

include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${Boost_INCLUDE_DIRS})
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})


add_fcl_test(test_fcl_math test_fcl_math.cpp)
Expand Down

0 comments on commit 4011a90

Please sign in to comment.