[llvm-commits] [llvm] r78768 - in /llvm/trunk: CMakeLists.txt tools/CMakeLists.txt tools/llvm-config/CMakeLists.txt

[Oscar Fuentes]

Author: ofv
Date: Tue Aug 11 20:36:27 2009
New Revision: 78768

URL: http://llvm.org/viewvc/llvm-project?rev=78768&view=rev
Log:
CMake: Re-enabled build of llvm-config. Removed recursive invocation
of cmake.

Modified:
    llvm/trunk/CMakeLists.txt
    llvm/trunk/tools/CMakeLists.txt
    llvm/trunk/tools/llvm-config/CMakeLists.txt

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=78768&r1=78767&r2=78768&view=diff

==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Tue Aug 11 20:36:27 2009
@@ -153,10 +153,6 @@
   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)

Modified: llvm/trunk/tools/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/CMakeLists.txt?rev=78768&r1=78767&r2=78768&view=diff

==============================================================================
--- llvm/trunk/tools/CMakeLists.txt (original)
+++ llvm/trunk/tools/CMakeLists.txt Tue Aug 11 20:36:27 2009
@@ -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()
 

Modified: llvm/trunk/tools/llvm-config/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/CMakeLists.txt?rev=78768&r1=78767&r2=78768&view=diff

==============================================================================
--- llvm/trunk/tools/llvm-config/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-config/CMakeLists.txt Tue Aug 11 20:36:27 2009
@@ -103,7 +103,6 @@
   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."
   )