Revert "Updating to the new version of the sixense library"

CMakeLists.txt

@@ -187,7 +187,6 @@ 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)
 

cmake/externals/Sixense/CMakeLists.txt

@@ -1,62 +0,0 @@
-include(ExternalProject)
-include(SelectLibraryConfigurations)
-
-set(EXTERNAL_NAME Sixense)
-
-ExternalProject_Add(
-  ${EXTERNAL_NAME}
-  URL http://hifi-public.s3.amazonaws.com/dependencies/SixenseSDK_071615.zip
-  URL_MD5 752a3901f334124e9cffc2ba4136ef7d
-  CONFIGURE_COMMAND ""
-  BUILD_COMMAND ""
-  INSTALL_COMMAND ""
-  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)
-  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 
-  add_paths_to_fixup_libs(${SIXENSE_DEBUG_DLL_PATH})
-  add_paths_to_fixup_libs(${SIXENSE_RELEASE_DLL_PATH})
-
-elseif(APPLE)
-
-  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)
-
-  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()
-

cmake/externals/sixense/CMakeLists.txt

@@ -0,0 +1,60 @@
+include(ExternalProject)
+include(SelectLibraryConfigurations)
+
+set(EXTERNAL_NAME Sixense)
+
+string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+
+ExternalProject_Add(
+  ${EXTERNAL_NAME}
+  URL ./SixenseSDK_062612.zip
+  URL_MD5 10cc8dc470d2ac1244a88cf04bc549cc
+  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()
+
+  # 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)
+
+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)
+
+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)
+  
+endif()
+

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)
+  list(APPEND SIXENSE_REQUIREMENTS SIXENSE_DEBUG_DLL_PATH SIXENSE_RELEASE_DLL_PATH SIXENSE_DEVICE_DLL_PATH)
 endif ()
 
 set(SIXENSE_LIBRARIES "${SIXENSE_LIBRARY}")

libraries/input-plugins/CMakeLists.txt

@@ -28,11 +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})
-message( ${SIXENSE_INCLUDE_DIRS})
+#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})
@@ -70,4 +69,4 @@ foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
       add_definitions(-DSIXENSE_LIB_FILENAME=\"${${${EXTERNAL}_UPPERCASE}_LIBRARY_RELEASE}\")
     endif ()
   endif ()
-endforeach()
+endforeach()