diff --git a/CMakeLists.txt b/CMakeLists.txt index a597c1022b39f542c2f22bb1c51e01a7dbb86c59..e2af8d7f47b528df992642649517e1eeb923a335 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,19 +78,19 @@ add_optional_dependency("octomap >= 1.6") if (OCTOMAP_INCLUDE_DIRS AND OCTOMAP_LIBRARY_DIRS) include_directories(${OCTOMAP_INCLUDE_DIRS}) link_directories(${OCTOMAP_LIBRARY_DIRS}) - set(FCL_HAVE_OCTOMAP 1) - string(REPLACE "." ";" VERSION_LIST ${OCTOMAP_VERSION}) - list(GET VERSION_LIST 0 OCTOMAP_MAJOR_VERSION) - list(GET VERSION_LIST 1 OCTOMAP_MINOR_VERSION) - list(GET VERSION_LIST 2 OCTOMAP_PATCH_VERSION) - add_definitions (-DOCTOMAP_MAJOR_VERSION=${OCTOMAP_MAJOR_VERSION} - -DOCTOMAP_MINOR_VERSION=${OCTOMAP_MINOR_VERSION} - -DOCTOMAP_PATCH_VERSION=${OCTOMAP_PATCH_VERSION}) + add_definitions (-DFCL_HAVE_OCTOMAP) + string(REPLACE "." ";" VERSION_LIST ${OCTOMAP_VERSION}) + list(GET VERSION_LIST 0 OCTOMAP_MAJOR_VERSION) + list(GET VERSION_LIST 1 OCTOMAP_MINOR_VERSION) + list(GET VERSION_LIST 2 OCTOMAP_PATCH_VERSION) + add_definitions (-DOCTOMAP_MAJOR_VERSION=${OCTOMAP_MAJOR_VERSION} + -DOCTOMAP_MINOR_VERSION=${OCTOMAP_MINOR_VERSION} + -DOCTOMAP_PATCH_VERSION=${OCTOMAP_PATCH_VERSION}) message(STATUS "FCL uses Octomap") else() message(STATUS "FCL does not use Octomap") endif() -add_definitions (-DFCL_HAVE_OCTOMAP=${FCL_HAVE_OCTOMAP}) + ADD_REQUIRED_DEPENDENCY("assimp >= 2.0") if(ASSIMP_FOUND) if (NOT ${ASSIMP_VERSION} VERSION_LESS "2.0.1150")