From 002738037c020f55aae2ba901921fd76587c6c3b Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 10 Mar 2014 09:28:20 -0700 Subject: [PATCH] only look for the 32-bit oculus lib on windows --- cmake/modules/FindLibOVR.cmake | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/cmake/modules/FindLibOVR.cmake b/cmake/modules/FindLibOVR.cmake index 015a1de42b..47b7d27015 100644 --- a/cmake/modules/FindLibOVR.cmake +++ b/cmake/modules/FindLibOVR.cmake @@ -36,26 +36,14 @@ else (LIBOVR_LIBRARIES AND LIBOVR_INCLUDE_DIRS) if (UDEV_LIBRARY AND XINERAMA_LIBRARY AND OVR_LIBRARY) set(LIBOVR_LIBRARIES "${OVR_LIBRARY};${UDEV_LIBRARY};${XINERAMA_LIBRARY}" CACHE INTERNAL "Oculus libraries") endif (UDEV_LIBRARY AND XINERAMA_LIBRARY AND OVR_LIBRARY) - elseif (WIN32) - if (CMAKE_CL_64) - set(WINDOWS_ARCH_DIR "Win32") - - if (CMAKE_BUILD_TYPE MATCHES DEBUG) - set(WINDOWS_LIBOVR_NAME "libovrd.lib") - else() - set(WINDOWS_LIBOVR_NAME "libovr.lib") - endif() + elseif (WIN32) + if (CMAKE_BUILD_TYPE MATCHES DEBUG) + set(WINDOWS_LIBOVR_NAME "libovrd.lib") else() - set(WINDOWS_ARCH_DIR "x64") - - if (CMAKE_BUILD_TYPE MATCHES DEBUG) - set(WINDOWS_LIBOVR_NAME "libovr64d.lib") - else() - set(WINDOWS_LIBOVR_NAME "libovr64.lib") - endif() + set(WINDOWS_LIBOVR_NAME "libovr.lib") endif() - find_library(LIBOVR_LIBRARIES "Lib/${WINDOWS_ARCH_DIR}/${LIBOVR_NAME}" HINTS ${LIBOVR_SEARCH_DIRS}) + find_library(LIBOVR_LIBRARIES "Lib/Win32/${LIBOVR_NAME}" HINTS ${LIBOVR_SEARCH_DIRS}) endif () if (LIBOVR_INCLUDE_DIRS AND LIBOVR_LIBRARIES)