Merge pull request #787 from bindreams/msvc-public-flag-guard

axxel · web-flow · commit 38da404a43d1 · 2024-05-20T23:40:51.000+02:00
Fix '/Zc:__cplusplus' leaking into GNU-based compilers on Windows
diff --git 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()
 
