[llvm] r279155 - [CMake] Make llvm-config implicit dependency for subprojects

[Chris Bieneman via llvm-commits]

Author: cbieneman
Date: Thu Aug 18 16:41:21 2016
New Revision: 279155

URL: http://llvm.org/viewvc/llvm-project?rev=279155&view=rev
Log:
[CMake] Make llvm-config implicit dependency for subprojects

The subproject interface being used for runtime libraries expects that llvm-config is passed into the subproject for consumption. We currently do this for every subproject, so we should expect that all LLVM ExternalProjects depend on llvm-config for the time being.

Eventually I'd like to see the sub-projects using LLVMConfig.cmake instead of the llvm-config binary, but that will take time to roll out.

Modified:
    llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake
    llvm/trunk/runtimes/CMakeLists.txt

Modified: llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake?rev=279155&r1=279154&r2=279155&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake (original)
+++ llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake Thu Aug 18 16:41:21 2016
@@ -120,7 +120,7 @@ function(llvm_ExternalProject_Add name s
   endif()
 
   ExternalProject_Add(${name}
-    DEPENDS ${ARG_DEPENDS}
+    DEPENDS ${ARG_DEPENDS} llvm-config
     ${name}-clobber
     PREFIX ${CMAKE_BINARY_DIR}/projects/${name}
     SOURCE_DIR ${source_dir}

Modified: llvm/trunk/runtimes/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/runtimes/CMakeLists.txt?rev=279155&r1=279154&r2=279155&view=diff
==============================================================================
--- llvm/trunk/runtimes/CMakeLists.txt (original)
+++ llvm/trunk/runtimes/CMakeLists.txt Thu Aug 18 16:41:21 2016
@@ -81,7 +81,7 @@ else() # if this is included from LLVM's
     # together in a single CMake invocaiton.
     llvm_ExternalProject_Add(runtimes
                              ${CMAKE_CURRENT_SOURCE_DIR}
-                             DEPENDS ${deps} llvm-config
+                             DEPENDS ${deps}
                              # Builtins were built separately above
                              CMAKE_ARGS -DCOMPILER_RT_BUILD_BUILTINS=Off
                              PASSTHROUGH_PREFIXES ${prefixes}