From: Lasse Collin <lasse.collin@tukaani.org>
Date: Fri, 6 Oct 2023 15:55:57 +0000 (+0300)
Subject: CMake/Windows: Fix when the windres workaround is applied.
X-Git-Tag: v5.5.1alpha~140
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d91cb6e884c73d0b05d7e7d68ad4e6eb29f4b44b;p=thirdparty%2Fxz.git

CMake/Windows: Fix when the windres workaround is applied.

CMake doesn't set WIN32 on CYGWIN but the workaround is
probably needed on Cygwin too. Same for MSYS and MSYS2.

The workaround must not be used with Clang that is acting in
MSVC mode. This fixes it by checking for the known environments
that need the workaround instead of using "NOT MSVC".

Thanks to Martin Storsjö.
https://github.com/tukaani-project/xz/commit/0570308ddd9c0e39e85597ebc0e31d4fc81d436f#commitcomment-129098431
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c653dc67..e0af3e15 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,9 +102,9 @@ set(CMAKE_MACOSX_BUNDLE OFF)
 #
 # CMake 3.27 doesn't have CMAKE_RC_COMPILER_ID so we rely on
 # CMAKE_C_COMPILER_ID.
-if(WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR (
-              CMAKE_C_COMPILER_ID STREQUAL "Clang" AND
-              CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "17")))
+if((MINGW OR CYGWIN OR MSYS) AND (
+        NOT CMAKE_C_COMPILER_ID STREQUAL "Clang" OR
+        CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "17"))
     # Use workarounds with GNU windres and llvm-windres >= 17.0.0. The \x20
     # in PACKAGE_NAME works with gcc and clang too so we don't need to worry
     # how to pass different flags to windres and the C compiler.