Skip to content

Commit b0a62e5

Browse files
authored
Merge branch 'master' into sw/fix_oob
2 parents 4c35e03 + bc3327f commit b0a62e5

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

‎.github/workflows/public.continuous.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
$opts += " -DEMBREE_TASKING_SYSTEM=INTERNAL"
131131
$opts += " -DEMBREE_TESTING_INTENSITY=2"
132132
133-
cmake -B build -G "Visual Studio 17 2022" -A ARM64 $opts.Split(" ") .
133+
cmake -B build -G "Visual Studio 18 2026" -A ARM64 $opts.Split(" ") .
134134
cmake --build build --config Release
135135
ctest --test-dir build -C Release --output-on-failure
136136
@@ -149,7 +149,7 @@ jobs:
149149
$opts += " -DEMBREE_TASKING_SYSTEM=INTERNAL"
150150
$opts += " -DEMBREE_TESTING_INTENSITY=2"
151151
152-
cmake -B build -G "Visual Studio 17 2022" $opts.Split(" ") .
152+
cmake -B build -G "Visual Studio 18 2026" $opts.Split(" ") .
153153
cmake --build build --config Release
154154
ctest --test-dir build -C Release --output-on-failure
155155

‎common/cmake/msvc.cmake‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /EHsc") # catch C++ exceptions
2020
SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /MP") # compile source files in parallel
2121
SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /GR") # enable runtime type information (on by default)
2222
SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /Gy") # package individual functions
23+
SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /guard:cf") # enable control flow guard
2324
IF (EMBREE_STACK_PROTECTOR)
2425
SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /GS") # protects against return address overrides
2526
ELSE()
@@ -60,6 +61,7 @@ SET(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWIT
6061
SET(SECURE_LINKER_FLAGS "")
6162
SET(SECURE_LINKER_FLAGS "${SECURE_LINKER_FLAGS} /NXCompat") # compatible with data execution prevention (on by default)
6263
SET(SECURE_LINKER_FLAGS "${SECURE_LINKER_FLAGS} /DynamicBase") # random rebase of executable at load time
64+
SET(SECURE_LINKER_FLAGS "${SECURE_LINKER_FLAGS} /guard:cf") # enable control flow guard
6365
IF (CMAKE_SIZEOF_VOID_P EQUAL 4)
6466
SET(SECURE_LINKER_FLAGS "${SECURE_LINKER_FLAGS} /SafeSEH") # invoke known exception handlers (Win32 only, x64 exception handlers are safe by design)
6567
ENDIF()
@@ -70,4 +72,3 @@ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /IGNORE:4217") # lo
7072
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /IGNORE:4049") # warning LNK4049: locally defined symbol _rtcOccluded1M imported
7173

7274
INCLUDE(msvc_post)
73-

0 commit comments

Comments
 (0)