From 3b06bbd88de71888bf248f0a86bc12b1e51d5915 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 7 Mar 2014 09:59:24 -0800
Subject: [PATCH] move sixense directory to lowercase, have find module look in
 env dir

---
 .gitignore                                         | 4 ++--
 cmake/modules/FindSixense.cmake                    | 9 ++++++---
 interface/external/{Sixense => sixense}/readme.txt | 0
 3 files changed, 8 insertions(+), 5 deletions(-)
 rename interface/external/{Sixense => sixense}/readme.txt (100%)

diff --git a/.gitignore b/.gitignore
index ea0cb8dc77..d66359205d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,8 +33,8 @@ interface/external/oculus/*
 !interface/external/oculus/readme.txt
 
 # Ignore Sixense
-interface/external/Sixense/*
-!interface/external/Sixense/readme.txt
+interface/external/sixense/*
+!interface/external/sixense/readme.txt
 
 # Ignore Visage
 interface/external/visage/*
diff --git a/cmake/modules/FindSixense.cmake b/cmake/modules/FindSixense.cmake
index cf23b2218c..59454d40e4 100644
--- a/cmake/modules/FindSixense.cmake
+++ b/cmake/modules/FindSixense.cmake
@@ -16,12 +16,15 @@ if (SIXENSE_LIBRARIES AND SIXENSE_INCLUDE_DIRS)
   # in cache already
   set(SIXENSE_FOUND TRUE)
 else (SIXENSE_LIBRARIES AND SIXENSE_INCLUDE_DIRS)
-  find_path(SIXENSE_INCLUDE_DIRS sixense.h ${SIXENSE_ROOT_DIR}/include)
+  
+  set(SIXENSE_SEARCH_DIRS "${SIXENSE_ROOT_DIR}" "$ENV{HIFI_ROOT_DIR}/sixense")
+  
+  find_path(SIXENSE_INCLUDE_DIRS include/sixense.h HINTS "${SIXENSE_SEARCH_DIRS}")
 
   if (APPLE)
-    find_library(SIXENSE_LIBRARIES libsixense_x64.dylib ${SIXENSE_ROOT_DIR}/lib/osx_x64/release_dll)
+    find_library(SIXENSE_LIBRARIES lib/osx_x64/release_dll/libsixense_x64.dylib HINTS "${SIXENSE_SEARCH_DIRS}")
   elseif (UNIX)
-    find_library(SIXENSE_LIBRARIES libsixense_x64.so ${SIXENSE_ROOT_DIR}/lib/linux_x64/release)
+    find_library(SIXENSE_LIBRARIES lib/linux_x64/release/libsixense_x64.so HINTS "${SIXENSE_SEARCH_DIRS}")
   endif ()
 
   if (SIXENSE_INCLUDE_DIRS AND SIXENSE_LIBRARIES)
diff --git a/interface/external/Sixense/readme.txt b/interface/external/sixense/readme.txt
similarity index 100%
rename from interface/external/Sixense/readme.txt
rename to interface/external/sixense/readme.txt