From 2b1f3c0ef37b134b1127094926cc79013256f37b Mon Sep 17 00:00:00 2001 From: bjorn Date: Sat, 11 Aug 2018 03:57:14 -0700 Subject: [PATCH] Support 64 bit builds; Use correct cmake target for openvr. --- CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index baf213ff..b0594545 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -202,12 +202,16 @@ if(NOT EMSCRIPTEN) include_directories(deps/openvr/headers) include_directories(deps/openvr/src) include_directories(deps/openvr/src/vrcommon) - add_subdirectory(deps/openvr openvr_api) - set_target_properties(openvr_api PROPERTIES + if(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 8) + set(LOVR_OPENVR openvr_api64) + else() + set(LOVR_OPENVR openvr_api) + endif() + add_subdirectory(deps/openvr) + set_target_properties(${LOVR_OPENVR} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/openvr_api" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/openvr_api" ) - set(LOVR_OPENVR openvr_api) endif() # pthreads