Skip to content

[CMake] Make MSVC runtime selection authoritative #8804

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

Closed
Alex Sepkowski (alsepkow) wants to merge 1 commit into from
Closed

[CMake] Make MSVC runtime selection authoritative #8804

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
76 changes: 40 additions & 36 deletions cmake/modules/ChooseMSVCCRT.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,7 @@
#
# The macro is invoked at the end of the file.
#
# CMake already sets CRT flags in the CMAKE_CXX_FLAGS_* and
# CMAKE_C_FLAGS_* variables by default. To let the user
# override that for each build type:
# 1. Detect which CRT is already selected, and reflect this in
# LLVM_USE_CRT_* so the user can have a better idea of what
# changes they're making.
# 2. Replace the flags in both variables with the new flag via a regex.
# 3. set() the variables back into the cache so the changes
# are user-visible.
# HLSL Change - removed outdated flag-rewriting description.

### Helper macros: ###
macro(make_crt_regex regex crts)
Expand All @@ -33,23 +25,7 @@ macro(get_current_crt crt_current regex flagsvar)
string(STRIP "${${crt_current}}" ${crt_current})
endmacro(get_current_crt)

# Replaces or adds a flag to a variable.
# Expects 'flag' to be padded with spaces.
macro(set_flag_in_var flagsvar regex flag)
string(REGEX MATCH "${${regex}}" current_flag "${${flagsvar}}")
if("${current_flag}" STREQUAL "")
set(${flagsvar} "${${flagsvar}}${${flag}}")
else()
string(REGEX REPLACE "${${regex}}" "${${flag}}" ${flagsvar} "${${flagsvar}}")
endif()
string(STRIP "${${flagsvar}}" ${flagsvar})
# Make sure this change gets reflected in the cache/gui.
# CMake requires the docstring parameter whenever set() touches the cache,
# so get the existing docstring and re-use that.
get_property(flagsvar_docs CACHE ${flagsvar} PROPERTY HELPSTRING)
set(${flagsvar} "${${flagsvar}}" CACHE STRING "${flagsvar_docs}" FORCE)
endmacro(set_flag_in_var)

# HLSL Change - removed set_flag_in_var().

macro(choose_msvc_crt MSVC_CRT)
if(LLVM_USE_CRT)
Expand All @@ -60,7 +36,11 @@ variables (LLVM_USE_CRT_DEBUG, etc) instead.")

make_crt_regex(MSVC_CRT_REGEX ${MSVC_CRT})

foreach(build_type ${CMAKE_CONFIGURATION_TYPES} ${CMAKE_BUILD_TYPE})
# HLSL Change Starts
set(llvm_crt_build_types ${CMAKE_CONFIGURATION_TYPES} ${CMAKE_BUILD_TYPE})
list(REMOVE_DUPLICATES llvm_crt_build_types)

foreach(build_type ${llvm_crt_build_types})
string(TOUPPER "${build_type}" build)
if (NOT LLVM_USE_CRT_${build})
get_current_crt(LLVM_USE_CRT_${build}
Expand All @@ -75,23 +55,48 @@ variables (LLVM_USE_CRT_DEBUG, etc) instead.")
endif(NOT LLVM_USE_CRT_${build})
endforeach(build_type)

foreach(build_type ${CMAKE_CONFIGURATION_TYPES} ${CMAKE_BUILD_TYPE})
set(llvm_crt_override_requested FALSE)
foreach(build_type ${llvm_crt_build_types})
string(TOUPPER "${build_type}" build)
if ("${LLVM_USE_CRT_${build}}" STREQUAL "")
set(flag_string " ")
else()
set(flag_string " /${LLVM_USE_CRT_${build}} ")
if (NOT "${LLVM_USE_CRT_${build}}" STREQUAL "")
set(llvm_crt_override_requested TRUE)
list(FIND ${MSVC_CRT} ${LLVM_USE_CRT_${build}} idx)
if (idx LESS 0)
message(FATAL_ERROR
"Invalid value for LLVM_USE_CRT_${build}: ${LLVM_USE_CRT_${build}}. Valid options are one of: ${${MSVC_CRT}}")
endif (idx LESS 0)
message(STATUS "Using ${build_type} VC++ CRT: ${LLVM_USE_CRT_${build}}")
endif()
foreach(lang C CXX)
set_flag_in_var(CMAKE_${lang}_FLAGS_${build} MSVC_CRT_REGEX flag_string)
endforeach(lang)
endforeach(build_type)

if (llvm_crt_override_requested)
set(cmake_msvc_runtime_library "")
foreach(build_type ${llvm_crt_build_types})
string(TOUPPER "${build_type}" build)
set(crt "${LLVM_USE_CRT_${build}}")
if ("${crt}" STREQUAL "")
if ("${build}" STREQUAL "DEBUG")
set(crt "MDd")
else()
set(crt "MD")
endif()
endif()

if ("${crt}" STREQUAL "MD")
set(runtime_library "MultiThreadedDLL")
elseif ("${crt}" STREQUAL "MDd")
set(runtime_library "MultiThreadedDebugDLL")
elseif ("${crt}" STREQUAL "MT")
set(runtime_library "MultiThreaded")
elseif ("${crt}" STREQUAL "MTd")
set(runtime_library "MultiThreadedDebug")
endif()
string(APPEND cmake_msvc_runtime_library
"$<$<CONFIG:${build_type}>:${runtime_library}>")
endforeach(build_type)
set(CMAKE_MSVC_RUNTIME_LIBRARY "${cmake_msvc_runtime_library}")
endif()
# HLSL Change Ends
endmacro(choose_msvc_crt MSVC_CRT)


Expand All @@ -103,4 +108,3 @@ set(MSVC_CRT
MTd)

choose_msvc_crt(MSVC_CRT)