Don't override C(XX)FLAGS for static MSVC library in prepare.py

Rely solely on CMAKE_MSVC_RUNTIME_LIBRARY
This commit is contained in:
Ilya Fedin 2025-05-01 14:21:43 +04:00 committed by John Preston
parent fcec85881f
commit e3a5a4239b

View file

@ -558,8 +558,7 @@ win:
cmake . ^
-A %WIN32X64% ^
-DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
-DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
-DCMAKE_POLICY_DEFAULT_CMP0091=NEW ^
-DCMAKE_C_FLAGS="/DZLIB_WINAPI" ^
-DZLIB_BUILD_EXAMPLES=OFF
cmake --build . --config Debug --parallel
@ -666,9 +665,7 @@ win:
cmake -B out . ^
-A %WIN32X64% ^
-DCMAKE_INSTALL_PREFIX=%LIBS_DIR%/local ^
-DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
-DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG"
-DOPUS_STATIC_RUNTIME=ON
cmake --build out --config Debug --parallel
cmake --build out --config Release --parallel
cmake --install out --config Release
@ -878,8 +875,7 @@ win:
-A %WIN32X64% ^
-DCMAKE_INSTALL_PREFIX=%LIBS_DIR%/local ^
-DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
-DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
-DCMAKE_POLICY_DEFAULT_CMP0091=NEW ^
-DBUILD_SHARED_LIBS=OFF ^
-DAVIF_ENABLE_WERROR=OFF ^
-DAVIF_CODEC_DAV1D=ON
@ -910,12 +906,9 @@ win:
-A %WIN32X64% ^
-DCMAKE_INSTALL_PREFIX=%LIBS_DIR%/local ^
-DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
-DCMAKE_POLICY_DEFAULT_CMP0091=NEW ^
-DCMAKE_C_FLAGS="/DLIBDE265_STATIC_BUILD" ^
-DCMAKE_CXX_FLAGS="/DLIBDE265_STATIC_BUILD" ^
-DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-DCMAKE_CXX_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
-DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
-DENABLE_SDL=OFF ^
-DBUILD_SHARED_LIBS=OFF ^
-DENABLE_DECODER=OFF ^
@ -989,10 +982,6 @@ win:
-A %WIN32X64% ^
-DCMAKE_INSTALL_PREFIX=%LIBS_DIR%/local ^
-DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
-DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-DCMAKE_CXX_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
-DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
-DBUILD_SHARED_LIBS=OFF ^
-DBUILD_TESTING=OFF ^
-DENABLE_PLUGIN_LOADING=OFF ^
@ -1061,10 +1050,6 @@ win:
-DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
-DCMAKE_C_FLAGS="/DJXL_STATIC_DEFINE /DJXL_THREADS_STATIC_DEFINE /DJXL_CMS_STATIC_DEFINE" ^
-DCMAKE_CXX_FLAGS="/DJXL_STATIC_DEFINE /DJXL_THREADS_STATIC_DEFINE /DJXL_CMS_STATIC_DEFINE" ^
-DCMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-DCMAKE_CXX_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
-DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" ^
%cmake_defines%
cmake --build . --config Debug --parallel
cmake --install . --config Debug
@ -1873,9 +1858,7 @@ win:
-D ADA_TESTING=OFF ^
-D ADA_TOOLS=OFF ^
-D ADA_INCLUDE_URL_PATTERN=OFF ^
-D CMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
-D CMAKE_C_FLAGS_DEBUG="/MTd /Zi /Ob0 /Od /RTC1" ^
-D CMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG"
-D CMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>"
cmake --build out --config Debug --parallel
cmake --build out --config Release --parallel
mac:
@ -1946,8 +1929,10 @@ win:
-DZLIB_FOUND=1 ^
-DZLIB_INCLUDE_DIR=%ZLIB_LIBS_DIR% ^
-DZLIB_LIBRARIES="%ZLIB_LIBS_DIR%\\Debug\\zlibstaticd.lib" ^
-DCMAKE_CXX_FLAGS_DEBUG="/DZLIB_WINAPI /DNDEBUG /MTd /Zi /Od /Ob0" ^
-DCMAKE_C_FLAGS_DEBUG="/DNDEBUG /MTd /Zi /Od /Ob0" ^
-DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
-DCMAKE_POLICY_DEFAULT_CMP0091=NEW ^
-DCMAKE_C_FLAGS="/DZLIB_WINAPI" ^
-DCMAKE_CXX_FLAGS="/DZLIB_WINAPI" ^
-DCMAKE_EXE_LINKER_FLAGS="/SAFESEH:NO Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib %OPENSSL_LIBS_DIR%.dbg\\libssl.lib" ^
-DCMAKE_SHARED_LINKER_FLAGS="/SAFESEH:NO Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib %OPENSSL_LIBS_DIR%.dbg\\libssl.lib" ^
-DTD_ENABLE_MULTI_PROCESSOR_COMPILATION=ON ^
@ -1965,8 +1950,10 @@ release:
-DZLIB_FOUND=1 ^
-DZLIB_INCLUDE_DIR=%ZLIB_LIBS_DIR% ^
-DZLIB_LIBRARIES="%ZLIB_LIBS_DIR%\\Release\\zlibstatic.lib" ^
-DCMAKE_CXX_FLAGS_RELEASE="/DZLIB_WINAPI /MT /Ob2" ^
-DCMAKE_C_FLAGS_RELEASE="/MT /Ob2" ^
-DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$<CONFIG:Debug>:Debug>" ^
-DCMAKE_POLICY_DEFAULT_CMP0091=NEW ^
-DCMAKE_C_FLAGS="/DZLIB_WINAPI" ^
-DCMAKE_CXX_FLAGS="/DZLIB_WINAPI" ^
-DCMAKE_EXE_LINKER_FLAGS="/SAFESEH:NO Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib %OPENSSL_LIBS_DIR%\\libssl.lib" ^
-DCMAKE_SHARED_LINKER_FLAGS="/SAFESEH:NO Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib %OPENSSL_LIBS_DIR%\\libssl.lib" ^
-DTD_ENABLE_MULTI_PROCESSOR_COMPILATION=ON ^