diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c7e6901..a433b7da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,7 +136,7 @@ find_package(Drawstuff QUIET) set_package_properties(assimp PROPERTIES URL "http://assimp.org" PURPOSE "Used in ompl_app for reading meshes representing robots and environments.") -find_package(assimp REQUIRED) +find_package(assimp CONFIG REQUIRED) set_package_properties(ccd PROPERTIES URL "https://github.com/danfis/libccd" PURPOSE "Collision detection library used by fcl.") @@ -178,8 +178,7 @@ include_directories( "${OMPLAPP_INCLUDE_DIRS}" "${OMPL_INCLUDE_DIRS}" "${EIGEN3_INCLUDE_DIR}" - "${FCL_INCLUDE_DIRS}" - "${ASSIMP_INCLUDE_DIRS}") + "${FCL_INCLUDE_DIRS}") # ROS installs fcl in /usr. In /usr/include/fcl/config.h it says octomap was # enabled. Octomap is installed in /opt/ros/${ROS_DISTRO}/include (most @@ -195,7 +194,7 @@ set(OMPLAPP_MODULE_LIBRARIES ${FCL_LIBRARIES}) set(OMPLAPP_LIBRARIES ${OPENGL_LIBRARIES} - ${ASSIMP_LIBRARIES} + assimp::assimp ${FCL_LIBRARIES}) link_directories(${ASSIMP_LIBRARY_DIRS} ${CCD_LIBRARY_DIRS} ${OCTOMAP_LIBRARY_DIRS} ${FCL_LIBRARY_DIRS})