From 1cfa4d7990ec4d2d991c65cb61f10bc267f8c9fa Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 17 Jul 2014 15:57:29 -0700
Subject: [PATCH] simplify the sixense find module removing unecessary checks

---
 cmake/modules/FindSixense.cmake | 51 +++++++++++----------------------
 1 file changed, 17 insertions(+), 34 deletions(-)

diff --git a/cmake/modules/FindSixense.cmake b/cmake/modules/FindSixense.cmake
index 9f408bacef..d1958e2ab3 100644
--- a/cmake/modules/FindSixense.cmake
+++ b/cmake/modules/FindSixense.cmake
@@ -18,40 +18,23 @@
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 # 
 
-if (SIXENSE_LIBRARIES AND SIXENSE_INCLUDE_DIRS)
-  # in cache already
-  set(SIXENSE_FOUND TRUE)
-else ()
-  
-  set(SIXENSE_SEARCH_DIRS "${SIXENSE_ROOT_DIR}" "$ENV{HIFI_LIB_DIR}/sixense")
-  
-  find_path(SIXENSE_INCLUDE_DIRS sixense.h PATH_SUFFIXES include HINTS ${SIXENSE_SEARCH_DIRS})
+set(SIXENSE_SEARCH_DIRS "${SIXENSE_ROOT_DIR}" "$ENV{HIFI_LIB_DIR}/sixense")
 
-  if (APPLE)
-    find_library(SIXENSE_LIBRARY_RELEASE lib/osx_x64/release_dll/libsixense_x64.dylib HINTS ${SIXENSE_SEARCH_DIRS})
-    find_library(SIXENSE_LIBRARY_DEBUG lib/osx_x64/debug_dll/libsixensed_x64.dylib HINTS ${SIXENSE_SEARCH_DIRS})
-  elseif (UNIX)
-    find_library(SIXENSE_LIBRARY_RELEASE lib/linux_x64/release/libsixense_x64.so HINTS ${SIXENSE_SEARCH_DIRS})
-    find_library(SIXENSE_LIBRARY_DEBUG lib/linux_x64/debug/libsixensed_x64.so HINTS ${SIXENSE_SEARCH_DIRS})
-  elseif (WIN32)
-    find_library(SIXENSE_LIBRARY_RELEASE lib/win32/release_dll/sixense.lib HINTS ${SIXENSE_SEARCH_DIRS})
-    find_library(SIXENSE_LIBRARY_DEBUG lib/win32/debug_dll/sixensed.lib HINTS ${SIXENSE_SEARCH_DIRS})
-  endif ()
-  
-  include(SelectLibraryConfigurations)
-  select_library_configurations(SIXENSE)
+find_path(SIXENSE_INCLUDE_DIRS sixense.h PATH_SUFFIXES include HINTS ${SIXENSE_SEARCH_DIRS})
 
-  if (SIXENSE_INCLUDE_DIRS AND SIXENSE_LIBRARIES)
-     set(SIXENSE_FOUND TRUE)
-  endif ()
- 
-  if (SIXENSE_FOUND)
-    if (NOT SIXENSE_FIND_QUIETLY)
-      message(STATUS "Found Sixense: ${SIXENSE_LIBRARIES}")
-    endif (NOT SIXENSE_FIND_QUIETLY)
-  else ()
-    if (SIXENSE_FIND_REQUIRED)
-      message(FATAL_ERROR "Could not find Sixense")
-    endif (SIXENSE_FIND_REQUIRED)
-  endif ()
+if (APPLE)
+  find_library(SIXENSE_LIBRARY_RELEASE lib/osx_x64/release_dll/libsixense_x64.dylib HINTS ${SIXENSE_SEARCH_DIRS})
+  find_library(SIXENSE_LIBRARY_DEBUG lib/osx_x64/debug_dll/libsixensed_x64.dylib HINTS ${SIXENSE_SEARCH_DIRS})
+elseif (UNIX)
+  find_library(SIXENSE_LIBRARY_RELEASE lib/linux_x64/release/libsixense_x64.so HINTS ${SIXENSE_SEARCH_DIRS})
+  find_library(SIXENSE_LIBRARY_DEBUG lib/linux_x64/debug/libsixensed_x64.so HINTS ${SIXENSE_SEARCH_DIRS})
+elseif (WIN32)
+  find_library(SIXENSE_LIBRARY_RELEASE lib/win32/release_dll/sixense.lib HINTS ${SIXENSE_SEARCH_DIRS})
+  find_library(SIXENSE_LIBRARY_DEBUG lib/win32/debug_dll/sixensed.lib HINTS ${SIXENSE_SEARCH_DIRS})
 endif ()
+
+include(SelectLibraryConfigurations)
+select_library_configurations(SIXENSE)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SIXENSE DEFAULT_MSG SIXENSE_INCLUDE_DIRS SIXENSE_LIBRARIES)