Clean CMakeLists.txt (remove FCL_HAVE_FLANN and FCL_HAVE_TINYXML)

CMakeLists.txt

@@ -64,11 +64,6 @@ if (OCTOMAP_INCLUDE_DIRS AND OCTOMAP_LIBRARY_DIRS)
 else()
 	message(STATUS "FCL does not use Octomap")
 endif()
-# flann package ill defined: comment.
-# add_optional_dependency("flann >= 1.7")
-# if (${FLANN_FOUND})
-#   add_definitions(-DFCL_HAVE_FLANN=1)
-# endif()
 
 SET(${PROJECT_NAME}_HEADERS
   include/hpp/fcl/collision_data.h

CMakeModules/Findflann.cmake

-# Find FLANN, a Fast Library for Approximate Nearest Neighbors
-
-include(FindPackageHandleStandardArgs)
-
-find_path(FLANN_INCLUDE_DIR flann.hpp PATH_SUFFIXES flann)
-if (FLANN_INCLUDE_DIR)
-    file(READ "${FLANN_INCLUDE_DIR}/config.h" FLANN_CONFIG)
-    string(REGEX REPLACE ".*FLANN_VERSION_ \"([0-9.]+)\".*" "\\1" FLANN_VERSION ${FLANN_CONFIG})
-    if(NOT FLANN_VERSION VERSION_LESS flann_FIND_VERSION)
-        string(REGEX REPLACE "/flann$" "" FLANN_INCLUDE_DIRS ${FLANN_INCLUDE_DIR})
-    endif()
-endif()
-
-find_package_handle_standard_args(flann DEFAULT_MSG FLANN_INCLUDE_DIRS)

CMakeModules/Findtinyxml.cmake

-# this module was taken from http://trac.evemu.org/browser/trunk/cmake/FindTinyXML.cmake
-# - Find TinyXML
-# Find the native TinyXML includes and library
-#
-# TINYXML_FOUND - True if TinyXML found.
-# TINYXML_INCLUDE_DIR - where to find tinyxml.h, etc.
-# TINYXML_LIBRARIES - List of libraries when using TinyXML.
-#
-INCLUDE( "FindPackageHandleStandardArgs" )
-
-
-FIND_PATH( TINYXML_INCLUDE_DIRS "tinyxml.h"
-PATH_SUFFIXES "tinyxml" )
-
-FIND_LIBRARY( TINYXML_LIBRARY_DIRS
-NAMES "tinyxml"
-PATH_SUFFIXES "tinyxml" )
-
-# handle the QUIETLY and REQUIRED arguments and set TINYXML_FOUND to TRUE if
-# all listed variables are TRUE
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( "TinyXML" DEFAULT_MSG TINYXML_INCLUDE_DIRS TINYXML_LIBRARY_DIRS )

include/hpp/fcl/config-fcl.hh.in

@@ -38,10 +38,7 @@
 # include "config.h"
 
 #cmakedefine01 FCL_HAVE_EIGEN
-
 #cmakedefine01 FCL_HAVE_OCTOMAP
-#cmakedefine01 FCL_HAVE_FLANN
-#cmakedefine01 FCL_HAVE_TINYXML
 
 #endif // FCL_CONFIG_FCL_HH