From eba446e7f66010436b70a331394f5a507f0b8103 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Mon, 17 Aug 2015 10:52:05 -0700
Subject: [PATCH 1/3] Updating to the new version of the sixense library

---
 CMakeLists.txt                         |  1 +
 cmake/externals/sixense/CMakeLists.txt | 61 +++++++++++++-------------
 cmake/modules/FindSixense.cmake        |  2 +-
 libraries/input-plugins/CMakeLists.txt |  8 ++--
 4 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38bcb42e26..41b88e4cea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,6 +187,7 @@ option(GET_OPENVR "Get OpenVR library automatically as external project" 1)
 option(GET_BOOSTCONFIG "Get Boost-config library automatically as external project" 1)
 option(GET_OGLPLUS "Get OGLplus library automatically as external project" 1)
 option(GET_GLEW "Get GLEW library automatically as external project" 1)
+option(GET_SIXENSE "Get Sixense library automatically as external project" 1)
 
 option(USE_NSIGHT "Attempt to find the nSight libraries" 1)
 
diff --git a/cmake/externals/sixense/CMakeLists.txt b/cmake/externals/sixense/CMakeLists.txt
index c80b492509..d0778774cb 100644
--- a/cmake/externals/sixense/CMakeLists.txt
+++ b/cmake/externals/sixense/CMakeLists.txt
@@ -7,54 +7,55 @@ string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 
 ExternalProject_Add(
   ${EXTERNAL_NAME}
-  URL ./SixenseSDK_062612.zip
-  URL_MD5 10cc8dc470d2ac1244a88cf04bc549cc
+  URL http://hifi-public.s3.amazonaws.com/dependencies/SixenseSDK_071615.zip
+  URL_MD5 752a3901f334124e9cffc2ba4136ef7d
   CONFIGURE_COMMAND ""
   BUILD_COMMAND ""
   INSTALL_COMMAND ""
   LOG_DOWNLOAD 1
 )
 
-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)
-endif ()
-
-
-
 ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
 
 set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE TYPE INTERNAL)
 
 if (WIN32)
-
-    if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-        set(ARCH_DIR "x64")
-        set(ARCH_SUFFIX "_x64")
-    else()
-        set(ARCH_DIR "Win32")
-        set(ARCH_SUFFIX "")
-    endif()
+  if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+      set(ARCH_DIR "x64/VS2013")
+      set(ARCH_SUFFIX "_x64")
+  else()
+      set(ARCH_DIR "Win32/VS2013")
+      set(ARCH_SUFFIX "")
+  endif()
+  
+  set(LIB_DIR "${SOURCE_DIR}/lib/${ARCH_DIR}")
+  set(BIN_DIR "${SOURCE_DIR}/bin/${ARCH_DIR}")
+  set(SIXENSE_LIBRARY_RELEASE "${LIB_DIR}/release_dll/sixense${ARCH_SUFFIX}.lib" CACHE FILEPATH "Sixense release lib")
+  set(SIXENSE_LIBRARY_DEBUG "${LIB_DIR}/debug_dll/sixensed${ARCH_SUFFIX}.lib" CACHE FILEPATH "Sixense debug lib")
+  set(SIXENSE_RELEASE_DLL_PATH "${BIN_DIR}/release_dll" CACHE FILEPATH "Sixense release DLL path")
+  set(SIXENSE_DEBUG_DLL_PATH "${BIN_DIR}/debug_dll" CACHE FILEPATH "Sixense debug DLL path")
 
   # FIXME need to account for different architectures 
-  set(${EXTERNAL_NAME_UPPER}_LIBRARIES "${SOURCE_DIR}/lib/${ARCH_DIR}/release_dll/sixense${ARCH_SUFFIX}.lib" CACHE TYPE INTERNAL)
-  add_paths_to_fixup_libs(${SOURCE_DIR}/bin/win32)
+  add_paths_to_fixup_libs(${SIXENSE_DEBUG_DLL_PATH})
+  add_paths_to_fixup_libs(${SIXENSE_RELEASE_DLL_PATH})
 
 elseif(APPLE)
 
-  # FIXME need to account for different architectures 
-  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/osx32/libopenvr_api.dylib CACHE TYPE INTERNAL)
-  add_paths_to_fixup_libs(${SOURCE_DIR}/bin/osx32)
+  set(ARCH_DIR "osx_x64")
+  set(ARCH_SUFFIX "_x64")
+  set(LIB_DIR "${SOURCE_DIR}/lib/${ARCH_DIR}")
+
+  set(SIXENSE_LIBRARY_RELEASE "${LIB_DIR}/release_dll/libsixense${ARCH_SUFFIX}.dylib" CACHE FILEPATH "Sixense release lib")
+  set(SIXENSE_LIBRARY_DEBUG "${LIB_DIR}/debug_dll/libsixensed${ARCH_SUFFIX}.dylib" CACHE FILEPATH "Sixense debug lib")
 
 elseif(NOT ANDROID)
 
-  # FIXME need to account for different architectures 
-  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/linux32/libopenvr_api.so CACHE TYPE INTERNAL)
-  add_paths_to_fixup_libs(${SOURCE_DIR}/bin/linux32)
-  
+  set(ARCH_DIR "linux_x64")
+  set(ARCH_SUFFIX "_x64")
+  set(LIB_DIR "${SOURCE_DIR}/lib/${ARCH_DIR}")
+
+  set(SIXENSE_LIBRARY_RELEASE "${LIB_DIR}/release/libsixense${ARCH_SUFFIX}.so" CACHE FILEPATH "Sixense release lib")
+  set(SIXENSE_LIBRARY_DEBUG "${LIB_DIR}/debug/libsixensed${ARCH_SUFFIX}.so" CACHE FILEPATH "Sixense debug lib")
+
 endif()
 
diff --git a/cmake/modules/FindSixense.cmake b/cmake/modules/FindSixense.cmake
index 98b37d5410..64cc1e0ffb 100644
--- a/cmake/modules/FindSixense.cmake
+++ b/cmake/modules/FindSixense.cmake
@@ -51,7 +51,7 @@ select_library_configurations(SIXENSE)
 
 set(SIXENSE_REQUIREMENTS SIXENSE_INCLUDE_DIRS SIXENSE_LIBRARIES)
 if (WIN32)
-  list(APPEND SIXENSE_REQUIREMENTS SIXENSE_DEBUG_DLL_PATH SIXENSE_RELEASE_DLL_PATH SIXENSE_DEVICE_DLL_PATH)
+  list(APPEND SIXENSE_REQUIREMENTS SIXENSE_DEBUG_DLL_PATH SIXENSE_RELEASE_DLL_PATH)
 endif ()
 
 set(SIXENSE_LIBRARIES "${SIXENSE_LIBRARY}")
diff --git a/libraries/input-plugins/CMakeLists.txt b/libraries/input-plugins/CMakeLists.txt
index c3ded6c587..41cee2f666 100644
--- a/libraries/input-plugins/CMakeLists.txt
+++ b/libraries/input-plugins/CMakeLists.txt
@@ -28,10 +28,10 @@ if (WIN32)
     target_link_libraries(${TARGET_NAME} ${OPENVR_LIBRARIES})
 endif()
 
-#add_dependency_external_projects(Sixense)
-#find_package(Sixense REQUIRED)
-#target_include_directories(${TARGET_NAME} PRIVATE ${SIXENSE_INCLUDE_DIRS})
-#target_link_libraries(${TARGET_NAME} ${SIXENSE_LIBRARIES})
+add_dependency_external_projects(Sixense)
+find_package(Sixense REQUIRED)
+target_include_directories(${TARGET_NAME} PRIVATE ${SIXENSE_INCLUDE_DIRS})
+target_link_libraries(${TARGET_NAME} ${SIXENSE_LIBRARIES})
 
 # perform standard include and linking for found externals
 foreach(EXTERNAL ${OPTIONAL_EXTERNALS})

From 86e21c91ba3fa3e5057786aee1beec3ce296f6a0 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 18 Aug 2015 15:08:48 -0700
Subject: [PATCH 2/3] Case issues again

---
 cmake/externals/{sixense => Sixense}/CMakeLists.txt | 8 +++-----
 libraries/input-plugins/CMakeLists.txt              | 3 ++-
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename cmake/externals/{sixense => Sixense}/CMakeLists.txt (96%)

diff --git a/cmake/externals/sixense/CMakeLists.txt b/cmake/externals/Sixense/CMakeLists.txt
similarity index 96%
rename from cmake/externals/sixense/CMakeLists.txt
rename to cmake/externals/Sixense/CMakeLists.txt
index d0778774cb..7991ccea1b 100644
--- a/cmake/externals/sixense/CMakeLists.txt
+++ b/cmake/externals/Sixense/CMakeLists.txt
@@ -1,10 +1,5 @@
-include(ExternalProject)
-include(SelectLibraryConfigurations)
-
 set(EXTERNAL_NAME Sixense)
 
-string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-
 ExternalProject_Add(
   ${EXTERNAL_NAME}
   URL http://hifi-public.s3.amazonaws.com/dependencies/SixenseSDK_071615.zip
@@ -15,8 +10,11 @@ ExternalProject_Add(
   LOG_DOWNLOAD 1
 )
 
+set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
+
 ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
 
+string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE TYPE INTERNAL)
 
 if (WIN32)
diff --git a/libraries/input-plugins/CMakeLists.txt b/libraries/input-plugins/CMakeLists.txt
index 41cee2f666..28af865c7a 100644
--- a/libraries/input-plugins/CMakeLists.txt
+++ b/libraries/input-plugins/CMakeLists.txt
@@ -32,6 +32,7 @@ add_dependency_external_projects(Sixense)
 find_package(Sixense REQUIRED)
 target_include_directories(${TARGET_NAME} PRIVATE ${SIXENSE_INCLUDE_DIRS})
 target_link_libraries(${TARGET_NAME} ${SIXENSE_LIBRARIES})
+message( ${SIXENSE_INCLUDE_DIRS})
 
 # perform standard include and linking for found externals
 foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
@@ -69,4 +70,4 @@ foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
       add_definitions(-DSIXENSE_LIB_FILENAME=\"${${${EXTERNAL}_UPPERCASE}_LIBRARY_RELEASE}\")
     endif ()
   endif ()
-endforeach()
\ No newline at end of file
+endforeach()

From 7f09df1d0ba4877a6a9c7b032dab6bc25e8f389c Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 18 Aug 2015 16:17:27 -0700
Subject: [PATCH 3/3] Fixing external

---
 cmake/externals/Sixense/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cmake/externals/Sixense/CMakeLists.txt b/cmake/externals/Sixense/CMakeLists.txt
index 7991ccea1b..46341bd37b 100644
--- a/cmake/externals/Sixense/CMakeLists.txt
+++ b/cmake/externals/Sixense/CMakeLists.txt
@@ -1,3 +1,6 @@
+include(ExternalProject)
+include(SelectLibraryConfigurations)
+
 set(EXTERNAL_NAME Sixense)
 
 ExternalProject_Add(