diff options
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 6dc47d6..552e7a5 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 40a7482..c7341cb 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}") |
