Skip to content

Fix ninja build on windows #2088

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

Merged
charles-lunarg merged 1 commit into from
Oct 28, 2026
Merged

Fix ninja build on windows #2088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "MSVC" OR (CMAKE_C_COMPILER_ID STREQUAL "Clang" A

# Enable EH Continuation Metadata for 64-bit architectures
if (CMAKE_SIZEOF_VOID_P EQUAL 8)
target_compile_options(loader_common_options INTERFACE $<$<COMPILE_LANGUAGE::CXX,C>:/guard:ehcont>)
target_compile_options(loader_common_options INTERFACE $<$<COMPILE_LANGUAGE:CXX,C>:/guard:ehcont>)
target_link_options(loader_common_options INTERFACE "LINKER:/guard:ehcont")
endif()

Expand Down
8 changes: 8 additions & 0 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,14 @@ if (WIN32)
endif()
endif()

# Make sure our deps also enable /guard:ehcont as on windows ninja wont build without it
if ((CMAKE_C_COMPILER_ID MATCHES "MSVC" OR (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_FRONTEND_VARIANT MATCHES "MSVC")) AND CMAKE_SIZEOF_VOID_P EQUAL 8)
target_compile_options(gtest PUBLIC "/guard:ehcont")
target_link_options(gtest PUBLIC "LINKER:/guard:ehcont")
target_compile_options(detours PUBLIC "/guard:ehcont")
target_link_options(detours PUBLIC "LINKER:/guard:ehcont")
endif()

option(ENABLE_LIVE_VERIFICATION_TESTS "Enable tests which expect to run on live drivers. Meant for manual verification only" OFF)

set(TEST_EXECUTION_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/executing_tests")
Expand Down
Loading