Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix __cplusplus macro for Visual Studio #237

Merged
merged 13 commits into from
Apr 12, 2024
Merged

Fix __cplusplus macro for Visual Studio #237

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
05215aa
Fix __cplusplus macro for Visual Studio
Twon Nov 27, 2023
ca64281
Upgrade GTest
Twon Dec 3, 2023
4f338e1
Force rebuild of GTest to build with C++17 onwards support
Twon Dec 3, 2023
465acd0
Reinstate cmake layout
Twon Dec 3, 2023
05dba2c
Test if fetched gtest correctly builds for C++17
Twon Dec 3, 2023
bc6e5ec
Manually build Gtest to work around fetching the wrong build from the…
Twon Dec 3, 2023
7993c9a
Merge branch 'main' into visual_studio_cplusplus_fix
Twon Feb 10, 2024
a381d8a
Merge branch 'main' into visual_studio_cplusplus_fix
Twon Feb 11, 2024
f10f5ab
Merge branch 'main' into visual_studio_cplusplus_fix
Twon Apr 12, 2024
db5dd58
Attemp to use pre-built GTest if available
Twon Apr 12, 2024
23e2f6b
Test fix is backward compatible with prior versions
Twon Apr 12, 2024
1f43d95
Revert to latest version
Twon Apr 12, 2024
251e704
Force building GTest on Windows is still required
Twon Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cmake/compiler.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ target_link_libraries(MorpheusConfig

target_compile_options(MorpheusConfig
INTERFACE
$<$<CXX_COMPILER_ID:MSVC>:/Zc:__cplusplus> # https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/
$<$<CXX_COMPILER_ID:MSVC>:${MSVC_WARNINGS}>
$<$<CXX_COMPILER_ID:GNU>:${GCC_WARNINGS}>
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:${CLANG_WARNINGS}>
Expand Down
Loading