diff options
| author | Hans Wennborg <hans@hanshq.net> | 2013-11-13 19:12:02 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2013-11-13 19:12:02 +0000 |
| commit | 4ac2e3c604f938ce3db5dc0af413e1010c1b99c9 (patch) | |
| tree | 8c66b5e1b5da87e4781db932e385eaca532f42de | |
| parent | 929bdb23794b615dc6b0cc59db21f0450c3ce33b (diff) | |
| download | llvm-4ac2e3c604f938ce3db5dc0af413e1010c1b99c9.tar.gz llvm-4ac2e3c604f938ce3db5dc0af413e1010c1b99c9.tar.bz2 llvm-4ac2e3c604f938ce3db5dc0af413e1010c1b99c9.tar.xz | |
CMake: make building with /MT an option instead of always forcing it
for release builds.
This is a follow-up to r194589. Aaron pointed out that building
libraries with /MT and using them in an application that uses a
different run-time library can be a bad idea.
Move the option to build with /MT behind a CMake option so it can be
turned on selectively, such as when building the toolchain installer.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194596 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/modules/HandleLLVMOptions.cmake | 7 | ||||
| -rw-r--r-- | docs/CMake.rst | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e6fd506f78..5a8eb98027 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,8 @@ set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}svn") option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF) +option(LLVM_STATIC_MSVC_RUNTIME "When using MSVC, link against the static run-time (/MT)" OFF) + option(LLVM_USE_FOLDERS "Enable solution folders in Visual Studio. Disable for Express versions." ON) if ( LLVM_USE_FOLDERS ) set_property(GLOBAL PROPERTY USE_FOLDERS ON) diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake index ff71c00544..9fdc708abd 100644 --- a/cmake/modules/HandleLLVMOptions.cmake +++ b/cmake/modules/HandleLLVMOptions.cmake @@ -41,13 +41,16 @@ else() endif() endif() -if(MSVC) - # Link release builds against the static runtime. +if(MSVC AND LLVM_STATIC_MSVC_RUNTIME) + # Link against the static runtime. foreach(flag CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS_MINSIZEREL) llvm_replace_compiler_option("${flag}" "/MD" "/MT") endforeach() + foreach(flag CMAKE_C_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG) + llvm_replace_compiler_option("${flag}" "/MDd" "/MTd") + endforeach() endif() if(WIN32) diff --git a/docs/CMake.rst b/docs/CMake.rst index c9fe538c9d..69eeaab529 100644 --- a/docs/CMake.rst +++ b/docs/CMake.rst @@ -280,6 +280,11 @@ LLVM-specific variables are ``Address``, ``Memory`` and ``MemoryWithOrigins``. Defaults to empty string. +**LLVM_STATIC_MSVC_RUNTIME**:BOOL + When building with MSVC, link against the static runtime library (/MT or /MTd + for release and debug builds, respectively) instead of the dynamic one. + Defaults to OFF. + Executing the test suite ======================== |