Fix octomap version handling.

CMakeLists.txt

@@ -84,7 +84,9 @@ if (OCTOMAP_INCLUDE_DIRS AND OCTOMAP_LIBRARY_DIRS)
         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")

include/hpp/fcl/math/vec_3f.h

@@ -57,10 +57,6 @@ namespace fcl
 
 
 #if FCL_HAVE_OCTOMAP
-  #define OCTOMAP_MAJOR_VERSION @OCTOMAP_MAJOR_VERSION@
-  #define OCTOMAP_MINOR_VERSION @OCTOMAP_MINOR_VERSION@
-  #define OCTOMAP_PATCH_VERSION @OCTOMAP_PATCH_VERSION@
-
   #define OCTOMAP_VERSION_AT_LEAST(x,y,z) \
     (OCTOMAP_MAJOR_VERSION > x || (OCTOMAP_MAJOR_VERSION >= x && \
     (OCTOMAP_MINOR_VERSION > y || (OCTOMAP_MINOR_VERSION >= y && \