File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change @@ -20,6 +20,7 @@ SET(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /EHsc") # catch C++ exceptions
2020SET (COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /MP" ) # compile source files in parallel
2121SET (COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /GR" ) # enable runtime type information (on by default)
2222SET (COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /Gy" ) # package individual functions
23+ SET (COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /guard:cf" ) # enable control flow guard
2324IF (EMBREE_STACK_PROTECTOR)
2425 SET (COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} /GS" ) # protects against return address overrides
2526ELSE ()
@@ -60,6 +61,7 @@ SET(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWIT
6061SET (SECURE_LINKER_FLAGS "" )
6162SET (SECURE_LINKER_FLAGS "${SECURE_LINKER_FLAGS} /NXCompat" ) # compatible with data execution prevention (on by default)
6263SET (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
6365IF (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)
6567ENDIF ()
@@ -70,4 +72,3 @@ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /IGNORE:4217") # lo
7072SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS } /IGNORE:4049" ) # warning LNK4049: locally defined symbol _rtcOccluded1M imported
7173
7274INCLUDE (msvc_post )
73-
You can’t perform that action at this time.
0 commit comments