From: Rafael Espindola Date: Sun, 16 Feb 2014 14:36:26 +0000 (+0000) Subject: Remove dead code, we already require cmake 2.8.8. X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=56d34914b2351d9ba7951a0325ca7908617d5699 Remove dead code, we already require cmake 2.8.8. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201495 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Target/X86/CMakeLists.txt b/lib/Target/X86/CMakeLists.txt index 77606ba36ee..206b6514f50 100644 --- a/lib/Target/X86/CMakeLists.txt +++ b/lib/Target/X86/CMakeLists.txt @@ -37,11 +37,6 @@ set(sources ) if( CMAKE_CL_64 ) - # A workaround for a bug in cmake 2.8.3. See PR 8885. - if( CMAKE_VERSION STREQUAL "2.8.3" ) - include(CMakeDetermineCompilerId) - endif() - # end of workaround. enable_language(ASM_MASM) ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/X86CompilationCallback_Win64.obj diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index f0890bb8679..67943c2e9a3 100644 --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -20,11 +20,7 @@ if(${LLVM_BUILD_RUNTIME}) if(NOT MSVC) add_llvm_external_project(libcxx) endif() - if(${CMAKE_VERSION} VERSION_GREATER 2.8.7) - add_llvm_external_project(compiler-rt) - else() - message(WARNING "Can't build compiler-rt, CMake 2.8.8 required!") - endif() + add_llvm_external_project(compiler-rt) endif() add_llvm_external_project(dragonegg)