Unverified Commit 1d2bcf1a authored by Justin Carpentier's avatar Justin Carpentier Committed by GitHub

Merge pull request #1289 from nim65s/devel

[CMake] {HPP_FCL → hpp-fcl}_FOUND
parents dfb9c560 36508f5b
Pipeline #11056 passed with stage
in 156 minutes and 47 seconds
......@@ -72,9 +72,9 @@ TARGET_INCLUDE_DIRECTORIES(timings-eigen PUBLIC ${EIGEN3_INCLUDE_DIR})
# timings-geometry
#
IF(URDFDOM_FOUND AND HPP_FCL_FOUND)
IF(URDFDOM_FOUND AND hpp-fcl_FOUND)
ADD_BENCH(timings-geometry TRUE)
ENDIF(URDFDOM_FOUND AND HPP_FCL_FOUND)
ENDIF(URDFDOM_FOUND AND hpp-fcl_FOUND)
# timings-jacobian
#
......
......@@ -36,13 +36,13 @@ IF(BUILD_ADVANCED_TESTING)
ENDIF()
ENDIF(BUILD_ADVANCED_TESTING)
IF(HPP_FCL_FOUND)
IF(hpp-fcl_FOUND)
IF(BUILD_WITH_UDRF_SUPPORT)
LIST(APPEND ${PROJECT_NAME}_EXAMPLES
collisions
)
ENDIF()
ENDIF(HPP_FCL_FOUND)
ENDIF(hpp-fcl_FOUND)
ADD_DEFINITIONS(-DPINOCCHIO_MODEL_DIR="${PINOCCHIO_MODEL_DIR}")
......@@ -79,7 +79,7 @@ IF(BUILD_PYTHON_INTERFACE)
)
ENDIF(BUILD_WITH_UDRF_SUPPORT)
IF(HPP_FCL_FOUND)
IF(hpp-fcl_FOUND)
LIST(APPEND ${PROJECT_NAME}_PYTHON_EXAMPLES
sample-model-viewer
display-shapes
......@@ -89,7 +89,7 @@ IF(BUILD_PYTHON_INTERFACE)
collisions
)
ENDIF(BUILD_WITH_UDRF_SUPPORT)
ENDIF(HPP_FCL_FOUND)
ENDIF(hpp-fcl_FOUND)
FOREACH(EXAMPLE ${${PROJECT_NAME}_PYTHON_EXAMPLES})
ADD_PYTHON_UNIT_TEST("example-py-${EXAMPLE}" "examples/${EXAMPLE}.py" "bindings/python")
......
......@@ -67,10 +67,10 @@ IF(urdfdom_FOUND)
ADD_PINOCCHIO_UNIT_TEST(urdf)
ADD_PINOCCHIO_UNIT_TEST(value)
IF(HPP_FCL_FOUND)
IF(hpp-fcl_FOUND)
ADD_PINOCCHIO_UNIT_TEST(geom)
ADD_PINOCCHIO_UNIT_TEST(srdf)
ENDIF(HPP_FCL_FOUND)
ENDIF(hpp-fcl_FOUND)
ENDIF(urdfdom_FOUND)
IF(BUILD_PYTHON_INTERFACE)
......
......@@ -41,7 +41,7 @@ SET(${PROJECT_NAME}_PYTHON_TESTS
version
)
IF(HPP_FCL_FOUND)
IF(hpp-fcl_FOUND)
SET(${PROJECT_NAME}_PYTHON_TESTS
${${PROJECT_NAME}_PYTHON_TESTS}
bindings_geometry_object
......@@ -52,7 +52,7 @@ IF(HPP_FCL_FOUND)
bindings_fcl_transform
)
ENDIF(BUILD_WITH_HPP_FCL_PYTHON_BINDINGS)
ENDIF(HPP_FCL_FOUND)
ENDIF(hpp-fcl_FOUND)
IF(URDFDOM_FOUND)
SET(${PROJECT_NAME}_PYTHON_TESTS
......
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