diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | llvm/tools/llvm-config/CMakeLists.txt | 11 |
2 files changed, 3 insertions, 13 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index dfdd13c36bc..05c58957969 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -95,8 +95,6 @@ endif(WIN32) 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 @@ if( MSVC ) endif( MSVC ) include_directories( ${LLVM_BINARY_DIR}/include ${LLVM_MAIN_INCLUDE_DIR}) -#link_directories( d:/dev/lib ) - -#add_subdirectory(lib) include(AddLLVM) include(AddPartiallyLinkedObject) diff --git a/llvm/tools/llvm-config/CMakeLists.txt b/llvm/tools/llvm-config/CMakeLists.txt index eb78840df0b..3f306034198 100644 --- a/llvm/tools/llvm-config/CMakeLists.txt +++ b/llvm/tools/llvm-config/CMakeLists.txt @@ -10,8 +10,6 @@ set(PREFIX ${LLVM_BINARY_DIR}) # TODO: Root for `make install'. 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(FINAL_LIBDEPS ${CMAKE_CURRENT_BINARY_DIR}/FinalLibDeps.txt) 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 @@ add_custom_command(OUTPUT ${LIBDEPS_TMP} 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} |
