[llvm] r201495 - Remove dead code, we already require cmake 2.8.8.

Rafael Espindola rafael.espindola at gmail.com
Sun Feb 16 06:36:27 PST 2014


Author: rafael
Date: Sun Feb 16 08:36:26 2014
New Revision: 201495

URL: http://llvm.org/viewvc/llvm-project?rev=201495&view=rev
Log:
Remove dead code, we already require cmake 2.8.8.

Modified:
    llvm/trunk/lib/Target/X86/CMakeLists.txt
    llvm/trunk/projects/CMakeLists.txt

Modified: llvm/trunk/lib/Target/X86/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/CMakeLists.txt?rev=201495&r1=201494&r2=201495&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/CMakeLists.txt (original)
+++ llvm/trunk/lib/Target/X86/CMakeLists.txt Sun Feb 16 08:36:26 2014
@@ -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

Modified: llvm/trunk/projects/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/projects/CMakeLists.txt?rev=201495&r1=201494&r2=201495&view=diff
==============================================================================
--- llvm/trunk/projects/CMakeLists.txt (original)
+++ llvm/trunk/projects/CMakeLists.txt Sun Feb 16 08:36:26 2014
@@ -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)





More information about the llvm-commits mailing list