From 6d8adbf2b58703df951f56ba1c5feead657f9b0d Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Mon, 27 Jul 2015 09:13:04 -0400 Subject: [PATCH] Make OpenVR windows only for now --- cmake/externals/openvr/CMakeLists.txt | 2 +- libraries/display-plugins/CMakeLists.txt | 2 +- .../src/display-plugins/openvr/OpenVrDisplayPlugin.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/externals/openvr/CMakeLists.txt b/cmake/externals/openvr/CMakeLists.txt index 0f19599826..2bb84ca637 100644 --- a/cmake/externals/openvr/CMakeLists.txt +++ b/cmake/externals/openvr/CMakeLists.txt @@ -38,7 +38,7 @@ elseif(NOT ANDROID) # FIXME need to account for different architectures set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/lib/linux64/libopenvr_api.so CACHE TYPE INTERNAL) - add_paths_to_fixup_libs(${SOURCE_DIR}/bin/linux32) + add_paths_to_fixup_libs(${SOURCE_DIR}/bin/linux64) endif() diff --git a/libraries/display-plugins/CMakeLists.txt b/libraries/display-plugins/CMakeLists.txt index b15d72dfad..321b13f191 100644 --- a/libraries/display-plugins/CMakeLists.txt +++ b/libraries/display-plugins/CMakeLists.txt @@ -26,7 +26,7 @@ find_package(LibOVR REQUIRED) target_include_directories(${TARGET_NAME} PRIVATE ${LIBOVR_INCLUDE_DIRS}) target_link_libraries(${TARGET_NAME} ${LIBOVR_LIBRARIES}) -if (NOT(APPLE)) +if (WIN32) add_dependency_external_projects(OpenVR) find_package(OpenVR REQUIRED) target_include_directories(${TARGET_NAME} PRIVATE ${OPENVR_INCLUDE_DIRS}) diff --git a/libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.cpp index 3c9b302b00..d0df531948 100644 --- a/libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.cpp @@ -7,7 +7,7 @@ // #include "OpenVrDisplayPlugin.h" -#if !defined(Q_OS_MAC) +#if defined(Q_OS_WIN) #include