From 5fd8db2fabee694dc29cc0a5ce7036a4fe7ccb63 Mon Sep 17 00:00:00 2001
From: Anna Zhukova <28830446+bindreams@users.noreply.github.com>
Date: Sun, 19 May 2024 02:18:57 +0300
Subject: [PATCH 1/2] Fix MSVC-style flags leaking into GNU frontends

---
 core/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index cd00f9bd26..4e4083ab96 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -52,7 +52,7 @@ if (WINRT)
 endif()
 if (MSVC)
     set (ZXING_PUBLIC_FLAGS ${ZXING_PUBLIC_FLAGS}
-        /Zc:__cplusplus
+    $<$<CXX_COMPILER_ID:MSVC>:/Zc:__cplusplus>
     )
 endif()
 
@@ -625,7 +625,7 @@ if (MSVC)
         COMPILE_PDB_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ZXing.pdb
             DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            CONFIGURATIONS Debug RelWithDebInfo 
+            CONFIGURATIONS Debug RelWithDebInfo
             OPTIONAL)
 endif()
 

From 4476430b960399a26d71668a85c550b1a3fbca8c Mon Sep 17 00:00:00 2001
From: Anna Zhukova <28830446+bindreams@users.noreply.github.com>
Date: Sun, 19 May 2024 02:29:26 +0300
Subject: [PATCH 2/2] Formatting

---
 core/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 4e4083ab96..7faec83ca3 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -52,7 +52,7 @@ if (WINRT)
 endif()
 if (MSVC)
     set (ZXING_PUBLIC_FLAGS ${ZXING_PUBLIC_FLAGS}
-    $<$<CXX_COMPILER_ID:MSVC>:/Zc:__cplusplus>
+        $<$<CXX_COMPILER_ID:MSVC>:/Zc:__cplusplus>
     )
 endif()