diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-07-18 10:15:29 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-07-18 10:15:29 +0200 |
| commit | 181770b1e169b9c7c75eacdc969102cce18a8be7 (patch) | |
| tree | 9f7a990c37dd48f803c9005da13cd86d3f8534cd /tracker-rs | |
| parent | c3a1174b922040da29b9c979343aa9fba24b46ba (diff) | |
some: adjust install paths and invocations
Diffstat (limited to 'tracker-rs')
| -rw-r--r-- | tracker-rs/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tracker-rs/ftnoir_tracker_rs.cpp | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tracker-rs/CMakeLists.txt b/tracker-rs/CMakeLists.txt index adde1dde..eb64feb1 100644 --- a/tracker-rs/CMakeLists.txt +++ b/tracker-rs/CMakeLists.txt @@ -9,6 +9,7 @@ if(WIN32) add_custom_target(opentrack-tracker-rs-impl DEPENDS ${libpath}) add_dependencies(opentrack-tracker-rs opentrack-tracker-rs-impl) target_link_libraries(opentrack-tracker-rs "${libpath}" advapi32) - install(FILES "${CMAKE_SOURCE_DIR}/tracker-rs/redist/intel_rs_sdk_runtime_websetup_10.0.26.0396.exe" DESTINATION ./contrib/ ${opentrack-perms}) - install(FILES "${CMAKE_SOURCE_DIR}/tracker-rs/redist/RS_EULA.rtf" DESTINATION ./contrib/ ${opentrack-perms}) + + install(FILES "${CMAKE_SOURCE_DIR}/tracker-rs/redist/intel_rs_sdk_runtime_websetup_10.0.26.0396.exe" DESTINATION ${opentrack-contrib-pfx} ${opentrack-perms}) + install(FILES "${CMAKE_SOURCE_DIR}/tracker-rs/redist/RS_EULA.rtf" DESTINATION ${opentrack-contrib-pfx} ${opentrack-perms}) endif() diff --git a/tracker-rs/ftnoir_tracker_rs.cpp b/tracker-rs/ftnoir_tracker_rs.cpp index d543c49c..4a59d74a 100644 --- a/tracker-rs/ftnoir_tracker_rs.cpp +++ b/tracker-rs/ftnoir_tracker_rs.cpp @@ -9,6 +9,7 @@ #include "ftnoir_tracker_rs_controls.h" #include "imagewidget.h" #include "opentrack/plugin-api.hpp" +#include "opentrack-library-path.h" #include <QMessageBox> #include <QProcess> #include <QStackedLayout> @@ -82,7 +83,9 @@ void RSTracker::handleTrackingEnded(int exitCode){ bool RSTracker::startSdkInstallationProcess() { - bool pStarted = QProcess::startDetached("contrib\\intel_rs_sdk_runtime_websetup_10.0.26.0396.exe --finstall=core,face3d --fnone=all"); + static const QString contrib_path(OPENTRACK_BASE_PATH + QString(OPENTRACK_CONTRIB_PATH)); + + bool pStarted = QProcess::startDetached(contrib_path + "intel_rs_sdk_runtime_websetup_10.0.26.0396.exe --finstall=core,face3d --fnone=all"); if(!pStarted){ QMessageBox::warning(0, "Intel® RealSense™ Runtime Installation", "Installation process failed to start.", QMessageBox::Ok); } |