[llvm] r242746 - [CMake] Fixing a problem with external projects that aren't getting enabled properly.

Chris Bieneman beanz at apple.com
Mon Jul 20 17:39:53 PDT 2015


Author: cbieneman
Date: Mon Jul 20 19:39:53 2015
New Revision: 242746

URL: http://llvm.org/viewvc/llvm-project?rev=242746&view=rev
Log:
[CMake] Fixing a problem with external projects that aren't getting enabled properly.

This should address PR 24194, and some builedbot failures.

Modified:
    llvm/trunk/cmake/modules/AddLLVM.cmake

Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=242746&r1=242745&r2=242746&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Mon Jul 20 19:39:53 2015
@@ -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})





More information about the llvm-commits mailing list