From 138e57bcd8397cca573bcbbd19e8f1310e2451f3 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 2 Oct 2014 11:16:25 -0700 Subject: [PATCH] don't set SIXENSE_LIB_FILENAME for INSTALLER_BUILD --- interface/CMakeLists.txt | 2 +- interface/src/devices/SixenseManager.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 5af8bcdd6b..19f8ef6d5f 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -139,7 +139,7 @@ foreach(EXTERNAL ${OPTIONAL_EXTERNALS}) if (NOT APPLE OR NOT ${${EXTERNAL}_UPPERCASE} MATCHES "SIXENSE") target_link_libraries(${TARGET_NAME} ${${${EXTERNAL}_UPPERCASE}_LIBRARIES}) - elseif (APPLE) + elseif (APPLE AND NOT INSTALLER_BUILD) add_definitions(-DSIXENSE_LIB_FILENAME=\"${${${EXTERNAL}_UPPERCASE}_LIBRARY_RELEASE}\") endif () endif () diff --git a/interface/src/devices/SixenseManager.cpp b/interface/src/devices/SixenseManager.cpp index 5fe2b9969c..bd0bbe8a32 100644 --- a/interface/src/devices/SixenseManager.cpp +++ b/interface/src/devices/SixenseManager.cpp @@ -97,7 +97,6 @@ void SixenseManager::initialize() { if (!_sixenseLibrary) { - #ifdef SIXENSE_LIB_FILENAME _sixenseLibrary = new QLibrary(SIXENSE_LIB_FILENAME); #else