[llvm-commits] [llvm] r142103 - in /llvm/trunk: docs/CMake.html tools/CMakeLists.txt

[NAKAMURA Takumi]

Author: chapuni
Date: Sat Oct 15 21:54:33 2011
New Revision: 142103

URL: http://llvm.org/viewvc/llvm-project?rev=142103&view=rev
Log:
CMake: Introduce LLVM_CLANG_SOURCE_DIR, "tools/clang" by default. Clang will not be built if LLVM_CLANG_SOURCE_DIR="" or ${LLVM_CLANG_SOURCE_DIR}/CMakeLists.txt is not found.

Modified:
    llvm/trunk/docs/CMake.html
    llvm/trunk/tools/CMakeLists.txt

Modified: llvm/trunk/docs/CMake.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CMake.html?rev=142103&r1=142102&r2=142103&view=diff
==============================================================================
--- llvm/trunk/docs/CMake.html (original)
+++ llvm/trunk/docs/CMake.html Sat Oct 15 21:54:33 2011
@@ -351,6 +351,11 @@
     Function Interface library. If the library or its headers are
     installed on a custom location, you can set the variables
     FFI_INCLUDE_DIR and FFI_LIBRARY_DIR. Defaults to OFF.</dd>
+
+  <dt><b>LLVM_CLANG_SOURCE_DIR</b>:PATH</dt>
+  <dd>Path to Clang's source directory. Defaults to tools/clang.
+    Clang will not be built when it is empty or it does not point valid
+    path.</dd>
 </dl>
 
 </div>

Modified: llvm/trunk/tools/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/CMakeLists.txt?rev=142103&r1=142102&r2=142103&view=diff
==============================================================================
--- llvm/trunk/tools/CMakeLists.txt (original)
+++ llvm/trunk/tools/CMakeLists.txt Sat Oct 15 21:54:33 2011
@@ -59,11 +59,14 @@
   endif()
 endif()
 
-if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/clang/CMakeLists.txt )
+set(LLVM_CLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/clang" CACHE PATH "Path to Clang source directory")
+
+if (NOT ${LLVM_CLANG_SOURCE_DIR} STREQUAL ""
+    AND EXISTS ${LLVM_CLANG_SOURCE_DIR}/CMakeLists.txt)
   option(LLVM_BUILD_CLANG "Whether to build Clang as part of LLVM" ON)
   if (${LLVM_BUILD_CLANG})
     add_subdirectory( ${CMAKE_CURRENT_SOURCE_DIR}/clang )
   endif()
-endif( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/clang/CMakeLists.txt )
+endif ()
 
 set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} PARENT_SCOPE)