Unverified Commit 4011a907 authored by Justin Carpentier's avatar Justin Carpentier Committed by GitHub
Browse files

Merge pull request #72 from jcarpent/devel

Sync submodule cmake and use SYSTEM option
parents 7532f7bb e33ecee4
Pipeline #5126 failed with stage
in 51 minutes and 6 seconds
...@@ -60,7 +60,7 @@ ENDIF(APPLE) ...@@ -60,7 +60,7 @@ ENDIF(APPLE)
setup_hpp_project() setup_hpp_project()
add_required_dependency("eigen3 >= 3.0.0") 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 # Add a cache variable to allow not compiling and running tests
set (RUN_TESTS TRUE CACHE BOOL "compile and run unit tests") set (RUN_TESTS TRUE CACHE BOOL "compile and run unit tests")
......
Subproject commit ecaf20c28c8ce33de312fbd812f88037cf995b73 Subproject commit 441552634e4c427956be7b2834a6bbf894b24f0c
...@@ -83,7 +83,7 @@ set(${LIBRARY_NAME}_SOURCES ...@@ -83,7 +83,7 @@ set(${LIBRARY_NAME}_SOURCES
) )
# Declare boost include directories # Declare boost include directories
include_directories(${Boost_INCLUDE_DIRS}) include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS}) link_directories(${Boost_LIBRARY_DIRS})
add_library(${LIBRARY_NAME} add_library(${LIBRARY_NAME}
......
...@@ -18,7 +18,7 @@ macro(add_fcl_test test_name) ...@@ -18,7 +18,7 @@ macro(add_fcl_test test_name)
endmacro(add_fcl_test) endmacro(add_fcl_test)
include_directories(${CMAKE_CURRENT_BINARY_DIR}) 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) add_fcl_test(test_fcl_math test_fcl_math.cpp)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment