diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2012-04-14 13:54:10 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2012-04-14 13:54:10 +0000 |
| commit | 63faed5b8e4f2755f127fcb8aa440480c0649327 (patch) | |
| tree | 19c69a04768629f2d440944b71cbe90adae0b615 /tools/CMakeLists.txt | |
| parent | d4c8b5d2e851b0e8a063c6bf8543a4823a26c15a (diff) | |
| download | src-63faed5b8e4f2755f127fcb8aa440480c0649327.tar.gz src-63faed5b8e4f2755f127fcb8aa440480c0649327.zip | |
Vendor import of llvm trunk r154661:vendor/llvm/llvm-trunk-r154661
Notes
Notes:
svn path=/vendor/llvm/dist/; revision=234285
svn path=/vendor/llvm/llvm-trunk-r154661/; revision=234286; tag=vendor/llvm/llvm-trunk-r154661
Diffstat (limited to 'tools/CMakeLists.txt')
| -rw-r--r-- | tools/CMakeLists.txt | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index e66648bee1e4..9668c764c689 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -11,11 +11,8 @@ if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/polly/CMakeLists.txt ) endif( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/polly/CMakeLists.txt ) if( NOT WIN32 OR MSYS OR CYGWIN ) - # It is useful to build llvm-config before the other tools, so we - # have a fresh LibDeps.txt for regenerating the hard-coded library - # dependencies. llvm-config/CMakeLists.txt takes care of this but we - # must keep llvm-config as the first entry on the list of tools to - # be built. + # We currently require 'sed' to build llvm-config, so don't try to build it + # on pure Win32. add_subdirectory(llvm-config) endif() @@ -31,6 +28,7 @@ add_subdirectory(llvm-nm) add_subdirectory(llvm-size) add_subdirectory(llvm-ld) +add_subdirectory(llvm-cov) add_subdirectory(llvm-prof) add_subdirectory(llvm-link) add_subdirectory(lli) @@ -39,6 +37,7 @@ add_subdirectory(llvm-extract) add_subdirectory(llvm-diff) add_subdirectory(macho-dump) add_subdirectory(llvm-objdump) +add_subdirectory(llvm-readobj) add_subdirectory(llvm-rtdyld) add_subdirectory(llvm-dwarfdump) @@ -46,7 +45,7 @@ add_subdirectory(bugpoint) add_subdirectory(bugpoint-passes) add_subdirectory(llvm-bcanalyzer) add_subdirectory(llvm-stub) -add_subdirectory(edis) +add_subdirectory(llvm-stress) if( NOT WIN32 ) add_subdirectory(lto) @@ -59,11 +58,14 @@ if( LLVM_ENABLE_PIC ) endif() endif() -if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/clang/CMakeLists.txt ) +set(LLVM_CLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/clang" CACHE PATH "Path to Clang source directory") + +if (NOT ${LLVM_CLANG_SOURCE_DIR} STREQUAL "" + AND EXISTS ${LLVM_CLANG_SOURCE_DIR}/CMakeLists.txt) option(LLVM_BUILD_CLANG "Whether to build Clang as part of LLVM" ON) if (${LLVM_BUILD_CLANG}) - add_subdirectory( ${CMAKE_CURRENT_SOURCE_DIR}/clang ) + add_subdirectory(${LLVM_CLANG_SOURCE_DIR} clang) endif() -endif( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/clang/CMakeLists.txt ) +endif () set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} PARENT_SCOPE) |