diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2011-02-26 22:09:03 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2011-02-26 22:09:03 +0000 |
| commit | c3b054d250cdca485c71845089c316e10610ebad (patch) | |
| tree | abae0246ec9156cc1a7cbb947b2b0dfe95fa3189 /tools/driver | |
| parent | bca07a4524feb4edec581062d631a13116320a24 (diff) | |
| download | src-c3b054d250cdca485c71845089c316e10610ebad.tar.gz src-c3b054d250cdca485c71845089c316e10610ebad.zip | |
Vendor import of clang trunk r126547:vendor/clang/clang-r126547
Notes
Notes:
svn path=/vendor/clang/dist/; revision=219069
svn path=/vendor/clang/clang-r126547/; revision=219070; tag=vendor/clang/clang-r126547
Diffstat (limited to 'tools/driver')
| -rw-r--r-- | tools/driver/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tools/driver/clang_symlink.cmake | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt index 6dc47d656cf9..552e7a534427 100644 --- a/tools/driver/CMakeLists.txt +++ b/tools/driver/CMakeLists.txt @@ -33,6 +33,8 @@ add_clang_executable(clang cc1as_main.cpp ) +set_target_properties(clang PROPERTIES VERSION ${CLANG_EXECUTABLE_VERSION}) + if(UNIX) set(CLANGXX_LINK_OR_COPY create_symlink) else() @@ -46,6 +48,8 @@ add_custom_target(clang++ ALL "${LLVM_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/clang${CMAKE_EXECUTABLE_SUFFIX}" "${clang_pp}" DEPENDS clang) +set_target_properties(clang++ PROPERTIES FOLDER "Clang executables") + set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${clang_pp}) diff --git a/tools/driver/clang_symlink.cmake b/tools/driver/clang_symlink.cmake index 40a74824cf2b..c7341cb2fa61 100644 --- a/tools/driver/clang_symlink.cmake +++ b/tools/driver/clang_symlink.cmake @@ -9,9 +9,16 @@ else() set(CLANGXX_LINK_OR_COPY copy) endif() +# CMAKE_EXECUTABLE_SUFFIX is undefined on cmake scripts. See PR9286. +if( WIN32 ) + set(EXECUTABLE_SUFFIX ".exe") +else() + set(EXECUTABLE_SUFFIX "") +endif() + set(bindir "${CLANGXX_DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/") -set(clang "clang${CMAKE_EXECUTABLE_SUFFIX}") -set(clangxx "clang++${CMAKE_EXECUTABLE_SUFFIX}") +set(clang "clang${EXECUTABLE_SUFFIX}") +set(clangxx "clang++${EXECUTABLE_SUFFIX}") message("Creating clang++ executable based on ${clang}") |