Skip to content

Commit

Permalink
Merge pull request zxing-cpp#787 from bindreams/msvc-public-flag-guard
Browse files Browse the repository at this point in the history
Fix '/Zc:__cplusplus' leaking into GNU-based compilers on Windows
  • Loading branch information
axxel authored May 20, 2024
2 parents d0c1f34 + 4476430 commit 38da404
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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()

Expand Down

0 comments on commit 38da404

Please sign in to comment.