diff options
| author | Oscar Fuentes <ofv@wanadoo.es> | 2009-08-12 01:36:27 +0000 |
|---|---|---|
| committer | Oscar Fuentes <ofv@wanadoo.es> | 2009-08-12 01:36:27 +0000 |
| commit | 2803365c4e6120f05605cf90619e7e7f0df5d7d6 (patch) | |
| tree | f45ba9ccb38b8c78cd22af1d8fc92db26cf89bc1 /tools | |
| parent | 26255adcaa5836fafe32e5e296d81df63a0fb9c5 (diff) | |
| download | external_llvm-2803365c4e6120f05605cf90619e7e7f0df5d7d6.zip external_llvm-2803365c4e6120f05605cf90619e7e7f0df5d7d6.tar.gz external_llvm-2803365c4e6120f05605cf90619e7e7f0df5d7d6.tar.bz2 | |
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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tools/llvm-config/CMakeLists.txt | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 1273c25..5dcfeba 100644 --- 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 2cfd6bb..3d3262f 100644 --- 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." ) |