From 87b2af25ba983230e903faea7de7cc8851448d0b Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Thu, 10 Aug 2017 12:03:56 -0700 Subject: [PATCH] re-enable sixense and update comment --- plugins/hifiSixense/CMakeLists.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/plugins/hifiSixense/CMakeLists.txt b/plugins/hifiSixense/CMakeLists.txt index 58aeb6c88f..55880584a8 100644 --- a/plugins/hifiSixense/CMakeLists.txt +++ b/plugins/hifiSixense/CMakeLists.txt @@ -6,11 +6,13 @@ # See the accompanying file LICENSE or http:#www.apache.org/licenses/LICENSE-2.0.html # -# FIXME if we want to re-enable this, we need to fix the mechanism for installing the +# FIXME if we want to properly re-enable this, we need to fix the mechanism for installing the # dependency dlls `msvcr100` and `msvcp100` WITHOUT using CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS -#if (NOT ANDROID) -# set(TARGET_NAME hifiSixense) -# setup_hifi_plugin(Script Qml Widgets) -# link_hifi_libraries(shared controllers ui plugins ui-plugins input-plugins) -# target_sixense() -#endif () +# currently this will build the hifiSixense plugin, but unless the user has previously installed +# the msvcr100 runtime support, the plugin will not load. +if (NOT ANDROID) + set(TARGET_NAME hifiSixense) + setup_hifi_plugin(Script Qml Widgets) + link_hifi_libraries(shared controllers ui plugins ui-plugins input-plugins) + target_sixense() +endif ()