diff options
| author | Chris Bieneman <beanz@apple.com> | 2016-12-20 16:28:18 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2016-12-20 16:28:18 +0000 |
| commit | 11da40b775805a2192edc9df8e427b6427a99a10 (patch) | |
| tree | 124cc6d42148bb3731c417a99f833ecbd083ba98 | |
| parent | 244891d1290f7387c996bdeec0fc5846576f3f42 (diff) | |
| download | bcm5719-llvm-11da40b775805a2192edc9df8e427b6427a99a10.tar.gz bcm5719-llvm-11da40b775805a2192edc9df8e427b6427a99a10.zip | |
[CMake] [PR31433] Fix LLDB tool installation
This resolves PR 31433.
llvm-svn: 290180
| -rw-r--r-- | lldb/cmake/modules/AddLLDB.cmake | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake index 1ca6f3e661b..fdf9f7f934d 100644 --- a/lldb/cmake/modules/AddLLDB.cmake +++ b/lldb/cmake/modules/AddLLDB.cmake @@ -117,7 +117,6 @@ function(add_lldb_executable name) set_target_properties(${name} PROPERTIES FOLDER "lldb executables") - set(install_dir bin) if(LLDB_BUILD_FRAMEWORK) if(ARG_INCLUDE_IN_FRAMEWORK) string(REGEX REPLACE "[^/]+" ".." _dots ${LLDB_FRAMEWORK_INSTALL_DIR}) @@ -129,18 +128,19 @@ function(add_lldb_executable name) set_target_properties(${name} PROPERTIES BUILD_WITH_INSTALL_RPATH On INSTALL_RPATH "@loader_path/../${LLDB_FRAMEWORK_INSTALL_DIR}") - if(ARG_GENERATE_INSTALL) - install(TARGETS ${name} - COMPONENT ${name} - RUNTIME DESTINATION ${install_dir}) - if (NOT CMAKE_CONFIGURATION_TYPES) - add_custom_target(install-${name} - DEPENDS ${name} - COMMAND "${CMAKE_COMMAND}" - -DCMAKE_INSTALL_COMPONENT=${name} - -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") - endif() - endif() + endif() + endif() + + if(ARG_GENERATE_INSTALL) + install(TARGETS ${name} + COMPONENT ${name} + RUNTIME DESTINATION bin) + if (NOT CMAKE_CONFIGURATION_TYPES) + add_custom_target(install-${name} + DEPENDS ${name} + COMMAND "${CMAKE_COMMAND}" + -DCMAKE_INSTALL_COMPONENT=${name} + -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") endif() endif() |
