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

[Oscar Fuentes]

Author: ofv
Date: Sat Nov 15 14:51:18 2008
New Revision: 59376

URL: http://llvm.org/viewvc/llvm-project?rev=59376&view=rev
Log:
CMake: Removed some cruft.

Modified:
    llvm/trunk/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=59376&r1=59375&r2=59376&view=diff

==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Sat Nov 15 14:51:18 2008
@@ -95,8 +95,6 @@
 if( EXISTS ${LLVM_TOOLS_BINARY_DIR}/llvm-config )
   set(HAVE_LLVM_CONFIG 1)
 endif( EXISTS ${LLVM_TOOLS_BINARY_DIR}/llvm-config )
-# find_file(HAVE_LLVM_CONFIG llvm-config ${LLVM_TOOLS_BINARY_DIR})
-# message(STATUS ${HAVE_LLVM_CONFIG})
 
 include(config-ix)
 
@@ -133,9 +131,6 @@
 endif( MSVC )
 
 include_directories( ${LLVM_BINARY_DIR}/include ${LLVM_MAIN_INCLUDE_DIR})
-#link_directories( d:/dev/lib )
-
-#add_subdirectory(lib)
 
 include(AddLLVM)
 include(AddPartiallyLinkedObject)

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

==============================================================================
--- llvm/trunk/tools/llvm-config/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvm-config/CMakeLists.txt Sat Nov 15 14:51:18 2008
@@ -10,8 +10,6 @@
 execute_process(COMMAND date
   OUTPUT_VARIABLE LLVM_CONFIGTIME
   OUTPUT_STRIP_TRAILING_WHITESPACE)
-set(abs_top_srcdir ${LLVM_MAIN_SRC_DIR})
-set(abs_top_builddir ${LLVM_BINARY_DIR})
 # LLVM_ON_UNIX and LLVM_ON_WIN32 already set.
 # those are set to blank by `autoconf' on MinGW, so it seems they are not required:
 #set(LLVMGCCDIR "")
@@ -59,10 +57,6 @@
 set(LLVM_CONFIG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/llvm-config)
 set(LLVM_CONFIG_IN ${CMAKE_CURRENT_BINARY_DIR}/llvm-config.in)
 
-# set(LIBDEPS LibDeps.txt)
-# set(LIBDEPS_TMP LibDeps.txt.tmp)
-# set(FINAL_LIBDEPS FinalLibDeps.txt)
-
 if( CMAKE_CROSSCOMPILING )
   set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
 endif()
@@ -79,8 +73,9 @@
   COMMENT "Regenerating ${LIBDEPS_TMP}")
 
 add_custom_command(OUTPUT ${LIBDEPS}
-  COMMAND cmp -s ${LIBDEPS_TMP} ${LIBDEPS} || \( cp ${LIBDEPS_TMP} ${LIBDEPS} && echo "Updated ${LIBDEPS} because dependencies changed" \)
-  DEPENDS ${LIBDEPS_TMP})
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${LIBDEPS_TMP} ${LIBDEPS}
+  DEPENDS ${LIBDEPS_TMP}
+  COMMENT "Updated ${LIBDEPS} because dependencies changed")
 
 add_custom_command(OUTPUT ${FINAL_LIBDEPS}
   COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/find-cycles.pl < ${LIBDEPS} > ${FINAL_LIBDEPS} || rm -f ${FINAL_LIBDEPS}