Commit 36508f5b authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[CMake] {HPP_FCL → hpp-fcl}_FOUND

since d1a7f8da, hpp-fcl is found using
the standard CMake procedure instead of pkg-config
parent dfb9c560
Pipeline #11054 passed with stage
in 151 minutes and 55 seconds
...@@ -72,9 +72,9 @@ TARGET_INCLUDE_DIRECTORIES(timings-eigen PUBLIC ${EIGEN3_INCLUDE_DIR}) ...@@ -72,9 +72,9 @@ TARGET_INCLUDE_DIRECTORIES(timings-eigen PUBLIC ${EIGEN3_INCLUDE_DIR})
# timings-geometry # timings-geometry
# #
IF(URDFDOM_FOUND AND HPP_FCL_FOUND) IF(URDFDOM_FOUND AND hpp-fcl_FOUND)
ADD_BENCH(timings-geometry TRUE) ADD_BENCH(timings-geometry TRUE)
ENDIF(URDFDOM_FOUND AND HPP_FCL_FOUND) ENDIF(URDFDOM_FOUND AND hpp-fcl_FOUND)
# timings-jacobian # timings-jacobian
# #
......
...@@ -36,13 +36,13 @@ IF(BUILD_ADVANCED_TESTING) ...@@ -36,13 +36,13 @@ IF(BUILD_ADVANCED_TESTING)
ENDIF() ENDIF()
ENDIF(BUILD_ADVANCED_TESTING) ENDIF(BUILD_ADVANCED_TESTING)
IF(HPP_FCL_FOUND) IF(hpp-fcl_FOUND)
IF(BUILD_WITH_UDRF_SUPPORT) IF(BUILD_WITH_UDRF_SUPPORT)
LIST(APPEND ${PROJECT_NAME}_EXAMPLES LIST(APPEND ${PROJECT_NAME}_EXAMPLES
collisions collisions
) )
ENDIF() ENDIF()
ENDIF(HPP_FCL_FOUND) ENDIF(hpp-fcl_FOUND)
ADD_DEFINITIONS(-DPINOCCHIO_MODEL_DIR="${PINOCCHIO_MODEL_DIR}") ADD_DEFINITIONS(-DPINOCCHIO_MODEL_DIR="${PINOCCHIO_MODEL_DIR}")
...@@ -79,7 +79,7 @@ IF(BUILD_PYTHON_INTERFACE) ...@@ -79,7 +79,7 @@ IF(BUILD_PYTHON_INTERFACE)
) )
ENDIF(BUILD_WITH_UDRF_SUPPORT) ENDIF(BUILD_WITH_UDRF_SUPPORT)
IF(HPP_FCL_FOUND) IF(hpp-fcl_FOUND)
LIST(APPEND ${PROJECT_NAME}_PYTHON_EXAMPLES LIST(APPEND ${PROJECT_NAME}_PYTHON_EXAMPLES
sample-model-viewer sample-model-viewer
display-shapes display-shapes
...@@ -89,7 +89,7 @@ IF(BUILD_PYTHON_INTERFACE) ...@@ -89,7 +89,7 @@ IF(BUILD_PYTHON_INTERFACE)
collisions collisions
) )
ENDIF(BUILD_WITH_UDRF_SUPPORT) ENDIF(BUILD_WITH_UDRF_SUPPORT)
ENDIF(HPP_FCL_FOUND) ENDIF(hpp-fcl_FOUND)
FOREACH(EXAMPLE ${${PROJECT_NAME}_PYTHON_EXAMPLES}) FOREACH(EXAMPLE ${${PROJECT_NAME}_PYTHON_EXAMPLES})
ADD_PYTHON_UNIT_TEST("example-py-${EXAMPLE}" "examples/${EXAMPLE}.py" "bindings/python") ADD_PYTHON_UNIT_TEST("example-py-${EXAMPLE}" "examples/${EXAMPLE}.py" "bindings/python")
......
...@@ -67,10 +67,10 @@ IF(urdfdom_FOUND) ...@@ -67,10 +67,10 @@ IF(urdfdom_FOUND)
ADD_PINOCCHIO_UNIT_TEST(urdf) ADD_PINOCCHIO_UNIT_TEST(urdf)
ADD_PINOCCHIO_UNIT_TEST(value) ADD_PINOCCHIO_UNIT_TEST(value)
IF(HPP_FCL_FOUND) IF(hpp-fcl_FOUND)
ADD_PINOCCHIO_UNIT_TEST(geom) ADD_PINOCCHIO_UNIT_TEST(geom)
ADD_PINOCCHIO_UNIT_TEST(srdf) ADD_PINOCCHIO_UNIT_TEST(srdf)
ENDIF(HPP_FCL_FOUND) ENDIF(hpp-fcl_FOUND)
ENDIF(urdfdom_FOUND) ENDIF(urdfdom_FOUND)
IF(BUILD_PYTHON_INTERFACE) IF(BUILD_PYTHON_INTERFACE)
......
...@@ -41,7 +41,7 @@ SET(${PROJECT_NAME}_PYTHON_TESTS ...@@ -41,7 +41,7 @@ SET(${PROJECT_NAME}_PYTHON_TESTS
version version
) )
IF(HPP_FCL_FOUND) IF(hpp-fcl_FOUND)
SET(${PROJECT_NAME}_PYTHON_TESTS SET(${PROJECT_NAME}_PYTHON_TESTS
${${PROJECT_NAME}_PYTHON_TESTS} ${${PROJECT_NAME}_PYTHON_TESTS}
bindings_geometry_object bindings_geometry_object
...@@ -52,7 +52,7 @@ IF(HPP_FCL_FOUND) ...@@ -52,7 +52,7 @@ IF(HPP_FCL_FOUND)
bindings_fcl_transform bindings_fcl_transform
) )
ENDIF(BUILD_WITH_HPP_FCL_PYTHON_BINDINGS) ENDIF(BUILD_WITH_HPP_FCL_PYTHON_BINDINGS)
ENDIF(HPP_FCL_FOUND) ENDIF(hpp-fcl_FOUND)
IF(URDFDOM_FOUND) IF(URDFDOM_FOUND)
SET(${PROJECT_NAME}_PYTHON_TESTS SET(${PROJECT_NAME}_PYTHON_TESTS
......
Supports Markdown
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