diff options
| author | Hans Wennborg <hans@hanshq.net> | 2013-11-13 20:29:10 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2013-11-13 20:29:10 +0000 |
| commit | 4656ec1e70a98c029b138a29be2f933a7a13f0bf (patch) | |
| tree | 94d183a91f380d7930f081790ada8a8747e6e944 | |
| parent | ff43160208d3e037f7c7c3c83419e6f5ac310e95 (diff) | |
| download | bcm5719-llvm-4656ec1e70a98c029b138a29be2f933a7a13f0bf.tar.gz bcm5719-llvm-4656ec1e70a98c029b138a29be2f933a7a13f0bf.zip | |
Revert my CMake patches concerning building with /MT (r194589, r194596)
Reid pointed out we already have LLVM_USE_CRT_{buildtype} to set it.
llvm-svn: 194604
| -rw-r--r-- | llvm/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | llvm/cmake/modules/HandleLLVMOptions.cmake | 13 | ||||
| -rw-r--r-- | llvm/docs/CMake.rst | 5 |
3 files changed, 0 insertions, 20 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 5a8eb980271..e6fd506f784 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -17,8 +17,6 @@ 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/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake index 9fdc708abd7..bb41a58df2d 100644 --- a/llvm/cmake/modules/HandleLLVMOptions.cmake +++ b/llvm/cmake/modules/HandleLLVMOptions.cmake @@ -5,7 +5,6 @@ include(AddLLVMDefinitions) include(CheckCCompilerFlag) include(CheckCXXCompilerFlag) -include(LLVMProcessSources) if( CMAKE_COMPILER_IS_GNUCXX ) set(LLVM_COMPILER_IS_GCC_COMPATIBLE ON) @@ -41,18 +40,6 @@ else() endif() endif() -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) if(CYGWIN) set(LLVM_ON_WIN32 0) diff --git a/llvm/docs/CMake.rst b/llvm/docs/CMake.rst index 69eeaab529d..c9fe538c9df 100644 --- a/llvm/docs/CMake.rst +++ b/llvm/docs/CMake.rst @@ -280,11 +280,6 @@ 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 ======================== |
