[CMake] Fixing a problem with external projects that aren't getting enabled properly.
authorChris Bieneman <beanz@apple.com>
Tue, 21 Jul 2015 00:39:53 +0000 (00:39 +0000)
committerChris Bieneman <beanz@apple.com>
Tue, 21 Jul 2015 00:39:53 +0000 (00:39 +0000)
This should address PR 24194, and some builedbot failures.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@242746 91177308-0d34-0410-b5e6-96231b3b80d8

cmake/modules/AddLLVM.cmake

index ebd17a0..6c21a46 100644 (file)
@@ -694,6 +694,10 @@ macro(add_llvm_external_project name)
     set(add_llvm_external_dir ${name})
   endif()
   canonicalize_tool_name(${name} nameUPPER)
+  if(NOT DEFINED LLVM_TOOL_${projectName}_BUILD)
+    option(LLVM_TOOL_${name}_BUILD
+           "Whether to build ${name} as part of LLVM" On)
+  endif()
   if (LLVM_TOOL_${nameUPPER}_BUILD)
     if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${add_llvm_external_dir}/CMakeLists.txt)
         add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/${add_llvm_external_dir} ${add_llvm_external_dir})