[llvm-commits] [llvm] r162815 - /llvm/trunk/projects/CMakeLists.txt

[Chandler Carruth]

Author: chandlerc
Date: Tue Aug 28 19:38:02 2012
New Revision: 162815

URL: http://llvm.org/viewvc/llvm-project?rev=162815&view=rev
Log:
Enable recursing into the compiler-rt projcet with the CMake build.

This only fires if using a recent enough CMake -- compiler-rt uses a few
of the more advanced features that not everyone needs.

Please let me know if anyone sees issues with this. I'll be updating
documentation and other stuff to tell people about this.

Many thanks to Alexey for doing a ton of work to get ASan's CMake build
into a really fantastic shape. =]

Modified:
    llvm/trunk/projects/CMakeLists.txt

Modified: llvm/trunk/projects/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/projects/CMakeLists.txt?rev=162815&r1=162814&r2=162815&view=diff
==============================================================================
--- llvm/trunk/projects/CMakeLists.txt (original)
+++ llvm/trunk/projects/CMakeLists.txt Tue Aug 28 19:38:02 2012
@@ -10,3 +10,11 @@
     endif()
   endif()
 endforeach(entry)
+
+# Also add in the compiler-rt tree if present and we have a sufficiently
+# recent version of CMake.
+if(${CMAKE_VERSION} VERSION_GREATER 2.8.7 AND
+   IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt AND
+   EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt/CMakeLists.txt)
+  add_subdirectory(compiler-rt)
+endif()