From 27fbc4ec168ecab93a3426d3016f4f39622c0d10 Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Thu, 9 Jun 2022 00:40:28 +0200 Subject: [PATCH] Don't call CMakeDetermineCXXCompiler on Win32, work around lack of CMAKE_CXX_COMPILER_ID being set --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35cf3b7e5c..c3970b8a67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,8 +151,10 @@ if(NOT DEFINED OVERTE_WARNINGS_AS_ERRORS) endif() if(OVERTE_WARNINGS_WHITELIST) - set(CMAKE_PLATFORM_INFO_DIR "${CMAKE_CURRENT_BINARY_DIR}") - include(CMakeDetermineCXXCompiler) + if (NOT WIN32) + set(CMAKE_PLATFORM_INFO_DIR "${CMAKE_CURRENT_BINARY_DIR}") + include(CMakeDetermineCXXCompiler) + endif() if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") message("GCC compiler detected, suppressing some unsolvable warnings.") @@ -160,7 +162,7 @@ if(OVERTE_WARNINGS_WHITELIST) elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") message("Clang compiler detected, suppressing some unsolvable warnings.") add_compile_definitions(OVERTE_WARNINGS_WHITELIST_CLANG) - elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC" OR (CMAKE_CXX_COMPILER_ID MATCHES "" AND WIN32)) message("Microsoft Visual Studio compiler detected, suppressing some unsolvable warnings.") add_compile_definitions(OVERTE_WARNINGS_WHITELIST_MSVC) else()