diff options
| author | Stefan Granitz <stefan.graenitz@gmail.com> | 2018-12-05 12:18:44 +0000 |
|---|---|---|
| committer | Stefan Granitz <stefan.graenitz@gmail.com> | 2018-12-05 12:18:44 +0000 |
| commit | 3d00002ea22beafb809277071813638eb8a987cc (patch) | |
| tree | 37d863fc074eab081c9b0d755e8f2305e306cbaf | |
| parent | 6f9b20426163bc6daf6e3ac27f76843ac6b3216f (diff) | |
| download | bcm5719-llvm-3d00002ea22beafb809277071813638eb8a987cc.tar.gz bcm5719-llvm-3d00002ea22beafb809277071813638eb8a987cc.zip | |
[CMake] Fix side-effect from LLDB_VERSION change in r346668 for framework-enabled builds
llvm-svn: 348360
| -rw-r--r-- | lldb/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lldb/cmake/modules/LLDBFramework.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt index 1e08adc7d3b..3d40e6fa125 100644 --- a/lldb/CMakeLists.txt +++ b/lldb/CMakeLists.txt @@ -56,7 +56,7 @@ if(LLDB_BUILD_FRAMEWORK) # the framework, and must be defined before building liblldb. set(PRODUCT_NAME "LLDB") set(EXECUTABLE_NAME "LLDB") - set(CURRENT_PROJECT_VERSION "${LLDB_VERSION}") + set(CURRENT_PROJECT_VERSION "${LLDB_VERSION_MAJOR}.${LLDB_VERSION_MINOR}.${LLDB_VERSION_PATCH}") set(LLDB_SUITE_TARGET lldb-framework) set(LLDB_FRAMEWORK_DIR diff --git a/lldb/cmake/modules/LLDBFramework.cmake b/lldb/cmake/modules/LLDBFramework.cmake index 4186f6c0221..b1959c0d4aa 100644 --- a/lldb/cmake/modules/LLDBFramework.cmake +++ b/lldb/cmake/modules/LLDBFramework.cmake @@ -27,7 +27,7 @@ if (NOT IOS) add_custom_command(TARGET lldb-framework POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink Versions/Current/Headers ${LLDB_FRAMEWORK_DIR}/LLDB.framework/Headers COMMAND ${CMAKE_COMMAND} -E create_symlink ${LLDB_FRAMEWORK_VERSION} ${LLDB_FRAMEWORK_DIR}/LLDB.framework/Versions/Current - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/clang/${LLDB_VERSION} $<TARGET_FILE_DIR:liblldb>/Resources/Clang + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH} $<TARGET_FILE_DIR:liblldb>/Resources/Clang ) endif() |
