aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Langford <apl@fb.com>2018-07-27 19:41:17 +0000
committerAlex Langford <apl@fb.com>2018-07-27 19:41:17 +0000
commitc1d4311c1b2c9adaa9b28e2e5316fd02171e17a2 (patch)
treef7d4f241a191ccede03550aaf2e107e39ea67efa /lldb/scripts/CMakeLists.txt
parentReland r338088, "ELF: Make --print-icf-sections output deterministic." (diff)
downloadllvm-project-c1d4311c1b2c9adaa9b28e2e5316fd02171e17a2.tar.gz
llvm-project-c1d4311c1b2c9adaa9b28e2e5316fd02171e17a2.tar.bz2
llvm-project-c1d4311c1b2c9adaa9b28e2e5316fd02171e17a2.zip
Stop building liblldb with CMake's framework functionality
Summary: CMake has a bug in its ninja generator that prevents you from installing targets that are built with framework support. Therefore, I want to not rely on CMake's framework support. See https://gitlab.kitware.com/cmake/cmake/issues/18216 Differential Revision: https://reviews.llvm.org/D49888 llvm-svn: 338154
Diffstat (limited to 'lldb/scripts/CMakeLists.txt')
-rw-r--r--lldb/scripts/CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/lldb/scripts/CMakeLists.txt b/lldb/scripts/CMakeLists.txt
index be5c3db53556..c8e0c981281d 100644
--- a/lldb/scripts/CMakeLists.txt
+++ b/lldb/scripts/CMakeLists.txt
@@ -25,9 +25,9 @@ set(SWIG_INSTALL_DIR lib${LLVM_LIBDIR_SUFFIX})
if(LLDB_BUILD_FRAMEWORK)
set(framework_arg --framework --target-platform Darwin)
set(SWIG_PYTHON_DIR
- ${LLDB_PYTHON_TARGET_DIR}/${LLDB_FRAMEWORK_RESOURCE_DIR}/Python)
+ ${LLDB_FRAMEWORK_DIR}/${LLDB_FRAMEWORK_RESOURCE_DIR}/Python)
set(SWIG_INSTALL_DIR
- ${LLDB_FRAMEWORK_INSTALL_DIR}/${LLDB_FRAMEWORK_RESOURCE_DIR})
+ ${LLDB_FRAMEWORK_INSTALL_DIR}/LLDB.framework/${LLDB_FRAMEWORK_RESOURCE_DIR})
endif()
get_filename_component(CFGBLDDIR ${LLDB_WRAP_PYTHON} DIRECTORY)
@@ -52,7 +52,7 @@ add_custom_command(
COMMENT "Python script building LLDB Python wrapper")
add_custom_target(swig_wrapper ALL DEPENDS ${LLDB_WRAP_PYTHON})
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/lldb.py PROPERTIES GENERATED 1)
+set_source_files_properties(${LLDB_PYTHON_TARGET_DIR}/lldb.py PROPERTIES GENERATED 1)
# Install the LLDB python module