CMake: Re-enabled build of llvm-config. Removed recursive invocation

of cmake.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90586fbe7b859fc99a1c2c33ee3d0bbc9344356d..0a4f88dfce45e3579cf977facce8d2779dfc7520 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,10 +153,6 @@ else(WIN32)
   endif(UNIX)
 endif(WIN32)
 
-if( EXISTS ${LLVM_TOOLS_BINARY_DIR}/llvm-config )
-  set(HAVE_LLVM_CONFIG 1)
-endif( EXISTS ${LLVM_TOOLS_BINARY_DIR}/llvm-config )
-
 include(config-ix)
 
 option(LLVM_ENABLE_PIC "Build Position-Independent Code" OFF)

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 1273c25cd79e37452a9596ad520d2378f088b150..5dcfebaa72af80aff68daec1354433904398a476 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -2,9 +2,7 @@
 # large and three small executables. This is done to minimize memory load
 # in parallel builds.  Please retain this ordering.
 
-# FIXME: We don't yet have the ability to build llvm-config with CMake
-# based on explicit dependencies.
-if (FALSE)
+if( NOT MSVC )
  add_subdirectory(llvm-config)
 endif()
 

diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt
index 2cfd6bb22a0f0bfafa8ff397f213d2581c0de65c..3d3262f6cfa689735712475260390b6102c6cefc 100644 (file)
--- a/tools/llvm-config/CMakeLists.txt
+++ b/tools/llvm-config/CMakeLists.txt
@@ -103,7 +103,6 @@ add_custom_command(OUTPUT ${LLVM_CONFIG}
   COMMAND ${CMAKE_COMMAND} -E remove -f temp.sed
   COMMAND cat ${FINAL_LIBDEPS} >> ${LLVM_CONFIG}
   COMMAND chmod +x ${LLVM_CONFIG}
-  COMMAND cd ${CMAKE_BINARY_DIR} && ${CMAKE_COMMAND} -U HAVE_LLVM_CONFIG -D LLVM_BINARY_DIR="${LLVM_BINARY_DIR}" ${CMAKE_SOURCE_DIR}
   DEPENDS ${FINAL_LIBDEPS} ${LLVM_CONFIG_IN}
   COMMENT "Building llvm-config script."
   )