From 4bb498e0ac62954baba4cb0ff592ad5bb920a636 Mon Sep 17 00:00:00 2001 From: Enrico van Oosten Date: Wed, 25 Sep 2019 14:32:56 +0000 Subject: [PATCH] !I CL 2033159, 2033542 ce/main_stabilisation -> ce/release_candidate !B (CMake) Disable Oculus VR plugin when using VS2019 16.3.0 due to compilation issue. !T (CMake) Fix Oculus VR plugin version check and comments Copied from Perforce Change: 2033663 --- Tools/CMake/BuildEngine.cmake | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Tools/CMake/BuildEngine.cmake b/Tools/CMake/BuildEngine.cmake index 9f7e136fa..09e53d397 100644 --- a/Tools/CMake/BuildEngine.cmake +++ b/Tools/CMake/BuildEngine.cmake @@ -43,11 +43,17 @@ endif() #Plugins if(WINDOWS) - - if(EXISTS "${SDK_DIR}/OculusSDK") - option(PLUGIN_VR_OCULUS "Oculus support" ON) + + # Oculus SDK 1.40.0 does not compile starting with Visual Studio 2019 16.3.0 (vc142) + if (MSVC_VERSION LESS 1923) + if(EXISTS "${SDK_DIR}/OculusSDK") + option(PLUGIN_VR_OCULUS "Oculus support" ON) + else() + option(PLUGIN_VR_OCULUS "Oculus support" OFF) + endif() else() - option(PLUGIN_VR_OCULUS "Oculus support" OFF) + message(WARNING "Disabling Oculus VR Plugin because Oculus SDK 1.40.0 does not compile starting with Visual Studio 2019 16.3.0 (vc142)") + unset(PLUGIN_VR_OCULUS CACHE) endif() option(OPTION_CRYMONO "C# support" OFF) -- 2.11.4.GIT