From bc39952b235616bcbe56008aa104d44ea6c34dd2 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Fri, 12 Jul 2024 21:20:48 +0200 Subject: [PATCH] cmake: only add SDL_LIBC=0 compile options to SDL2 libraries --- CMakeLists.txt | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a2b8b11769..c9c65aa6a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1779,14 +1779,6 @@ elseif(WINDOWS) list(APPEND SOURCE_FILES ${WINRT_SOURCE_FILES}) endif() - if(MSVC AND NOT SDL_LIBC) - # Prevent codegen that would use the VC runtime libraries. - set_property(DIRECTORY . APPEND PROPERTY COMPILE_OPTIONS "/GS-;/Gs1048576") - if(NOT ARCH_64 AND NOT CMAKE_GENERATOR_PLATFORM STREQUAL "ARM") - set_property(DIRECTORY . APPEND PROPERTY COMPILE_OPTIONS "/arch:SSE") - endif() - endif() - if(SDL_MISC) if(WINDOWS_STORE) file(GLOB MISC_SOURCES ${SDL2_SOURCE_DIR}/src/misc/winrt/*.cpp) @@ -3530,6 +3522,20 @@ if(SDL_TEST) set_property(TARGET SDL2_test PROPERTY INTERFACE_SDL_VERSION "SDL2") endif() +if(MSVC AND NOT SDL_LIBC) + set(targets SDL2) + if(TARGET SDL2-static) + list(APPEND targets SDL2-static) + endif() + if(TARGET SDL2_test) + list(APPEND targets SDL2_test) + endif() + set_property(TARGET ${targets} APPEND PROPERTY COMPILE_OPTIONS "/GS-;/Gs1048576") + if(NOT ARCH_64 AND NOT CMAKE_GENERATOR_PLATFORM STREQUAL "ARM") + set_property(TARGET ${targets} APPEND PROPERTY COMPILE_OPTIONS "/arch:SSE") + endif() +endif() + ##### Installation targets ##### if(NOT SDL2_DISABLE_INSTALL) if(SDL_SHARED)