Fix finding octomap (#1275)

dartsim · Apr 20, 2019 · b23f04d · b23f04d
1 parent b427e40
commit b23f04d
Showing 1 changed file with 32 additions and 22 deletions.
diff --git a/cmake/DARTFindDependencies.cmake b/cmake/DARTFindDependencies.cmake
@@ -90,30 +90,40 @@ dart_find_package(Boost)
 
 # octomap
 dart_find_package(octomap)
-if (octomap_FOUND AND NOT MSVC)
-  if (MSVC)
-    # Supporting Octomap on Windows is disabled for the following issue:
-    # https://github.com/OctoMap/octomap/pull/213
-    message(WARNING "Octomap ${octomap_VERSION} is found, but Octomap "
-        "is not supported on Windows until "
-        "'https://github.com/OctoMap/octomap/pull/213' "
-        "is resolved.")
-    set(HAVE_OCTOMAP FALSE CACHE BOOL "Check if octomap found." FORCE)
-  elseif (NOT octomap_VERSION VERSION_LESS 1.9.0)
-    message(WARNING "Octomap ${octomap_VERSION} is found, but Octomap 1.9.0 or "
-        "greater is not supported yet. Please see "
-        "'https://github.com/dartsim/dart/issues/1078' for the details")
-    set(HAVE_OCTOMAP FALSE CACHE BOOL "Check if octomap found." FORCE)
-  else()
-    set(HAVE_OCTOMAP TRUE CACHE BOOL "Check if octomap found." FORCE)
-    if(DART_VERBOSE)
-      message(STATUS "Looking for octomap - version ${octomap_VERSION} found")
+if(MSVC)
+  # Supporting Octomap on Windows is disabled for the following issue:
+  # https://github.com/OctoMap/octomap/pull/213
+  message(WARNING "Octomap ${octomap_VERSION} is found, but Octomap "
+      "is not supported on Windows until "
+      "'https://github.com/OctoMap/octomap/pull/213' "
+      "is resolved.")
+  set(HAVE_OCTOMAP FALSE CACHE BOOL "Check if octomap found." FORCE)
+else()
+  if(OCTOMAP_FOUND OR octomap_FOUND)
+    if(NOT DEFINED octomap_VERSION)
+      set(HAVE_OCTOMAP FALSE CACHE BOOL "Check if octomap found." FORCE)
+      message(STATUS "Looking for octomap - octomap_VERSION is not defined, "
+          "please install octomap with version information"
+      )
+    else()
+      if(NOT octomap_VERSION VERSION_LESS 1.9.0)
+        message(WARNING "Octomap ${octomap_VERSION} is found, but Octomap 1.9.0 or "
+            "greater is not supported yet. Please see "
+            "'https://github.com/dartsim/dart/issues/1078' for the details")
+        set(HAVE_OCTOMAP FALSE CACHE BOOL "Check if octomap found." FORCE)
+      else()
+        set(HAVE_OCTOMAP TRUE CACHE BOOL "Check if octomap found." FORCE)
+        if(DART_VERBOSE)
+          message(STATUS "Looking for octomap - version ${octomap_VERSION} found")
+        endif()
+      endif()
     endif()
+  else()
+    set(HAVE_OCTOMAP FALSE CACHE BOOL "Check if octomap found." FORCE)
+    message(STATUS "Looking for octomap - NOT found, to use VoxelGridShape, "
+        "please install octomap"
+    )
   endif()
-else()
-  set(HAVE_OCTOMAP FALSE CACHE BOOL "Check if octomap found." FORCE)
-  message(STATUS "Looking for octomap - NOT found, to use VoxelGridShape, "
-      "please install octomap")
 endif()
 
 #--------------------