Limit sixense to mavericks and below

cmake/externals/sixense/CMakeLists.txt

@@ -35,20 +35,31 @@ if (WIN32)
 
 elseif(APPLE)
 
-    set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/osx_x64/release_dll/libsixense_x64.dylib CACHE TYPE INTERNAL)
-
-    set(_SIXENSE_LIB_DIR "${SOURCE_DIR}/lib/osx_x64/release_dll")
-
+    set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${SOURCE_DIR}/lib/osx_x64/release_dll/libsixense_x64.dylib CACHE TYPE INTERNAL)
+    set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${SOURCE_DIR}/lib/osx_x64/debug_dll/libsixensed_x64.dylib CACHE TYPE INTERNAL)
+  
+    set(_SIXENSE_LIB_DIR "${SOURCE_DIR}/lib/osx_x64")
     ExternalProject_Add_Step(
       ${EXTERNAL_NAME}
       change-install-name-release
       COMMENT "Calling install_name_tool on libraries to fix install name for dylib linking"
-      COMMAND ${CMAKE_COMMAND} -DINSTALL_NAME_LIBRARY_DIR=${_SIXENSE_LIB_DIR} -P ${EXTERNAL_PROJECT_DIR}/OSXInstallNameChange.cmake
+      COMMAND ${CMAKE_COMMAND} -DINSTALL_NAME_LIBRARY_DIR=${_SIXENSE_LIB_DIR}/release_dll -P ${EXTERNAL_PROJECT_DIR}/OSXInstallNameChange.cmake
       DEPENDEES install
       WORKING_DIRECTORY <SOURCE_DIR>
       LOG 1
     )
 
+    set(_SIXENSE_LIB_DIR "${SOURCE_DIR}/lib/osx_x64")
+    ExternalProject_Add_Step(
+      ${EXTERNAL_NAME}
+      change-install-name-debug
+      COMMENT "Calling install_name_tool on libraries to fix install name for dylib linking"
+      COMMAND ${CMAKE_COMMAND} -DINSTALL_NAME_LIBRARY_DIR=${_SIXENSE_LIB_DIR}/debug_dll -P ${EXTERNAL_PROJECT_DIR}/OSXInstallNameChange.cmake
+      DEPENDEES install
+      WORKING_DIRECTORY <SOURCE_DIR>
+      LOG 1
+    )
+    
 elseif(NOT ANDROID)
 
     # FIXME need to account for different architectures 

cmake/modules/FindSixense.cmake

@@ -18,6 +18,10 @@
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 # 
 
+include(SelectLibraryConfigurations)
+select_library_configurations(SIXENSE)
+
+set(SIXENSE_REQUIREMENTS SIXENSE_INCLUDE_DIRS SIXENSE_LIBRARIES)
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Sixense DEFAULT_MSG SIXENSE_INCLUDE_DIRS SIXENSE_LIBRARIES)
 mark_as_advanced(SIXENSE_LIBRARIES SIXENSE_INCLUDE_DIRS SIXENSE_SEARCH_DIRS)

libraries/input-plugins/src/input-plugins/SixenseManager.cpp

@@ -12,6 +12,8 @@
 #include <vector>
 
 #include <QCoreApplication>
+#include <QtCore/QSysInfo>
+#include <QtGlobal>
 
 #include <GLMHelpers.h>
 #include <NumericalConstants.h>
@@ -74,7 +76,13 @@ SixenseManager::SixenseManager() :
 
 bool SixenseManager::isSupported() const {
 #ifdef HAVE_SIXENSE
+
+#if defined(Q_OS_OSX)
+    return QSysInfo::macVersion() <= QSysInfo::MV_MAVERICKS;
+#else
     return true;
+#endif
+    
 #else
     return false;
 #endif