diff options
| -rw-r--r-- | lldb/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | lldb/test/CMakeLists.txt | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt index 83649e4fa8b..9c464929824 100644 --- a/lldb/CMakeLists.txt +++ b/lldb/CMakeLists.txt @@ -37,6 +37,11 @@ if(APPLE) add_definitions(-DLLDB_USE_OS_LOG) endif() +if(LLDB_BUILD_FRAMEWORK) + set(LLDB_FRAMEWORK_DIR + ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_FRAMEWORK_INSTALL_DIR}) +endif() + # add_subdirectory(include) add_subdirectory(docs) if (NOT LLDB_DISABLE_PYTHON) @@ -47,8 +52,7 @@ if (NOT LLDB_DISABLE_PYTHON) set(LLDB_PYTHON_TARGET_DIR ${LLDB_BINARY_DIR}/scripts) set(LLDB_WRAP_PYTHON ${LLDB_BINARY_DIR}/scripts/LLDBWrapPython.cpp) if(LLDB_BUILD_FRAMEWORK) - set(LLDB_PYTHON_TARGET_DIR - ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_FRAMEWORK_INSTALL_DIR}) + set(LLDB_PYTHON_TARGET_DIR ${LLDB_FRAMEWORK_DIR}) set(LLDB_WRAP_PYTHON ${LLDB_PYTHON_TARGET_DIR}/LLDBWrapPython.cpp) else() # Don't set -m when building the framework. diff --git a/lldb/test/CMakeLists.txt b/lldb/test/CMakeLists.txt index 54976edb383..463c147ff6c 100644 --- a/lldb/test/CMakeLists.txt +++ b/lldb/test/CMakeLists.txt @@ -78,7 +78,7 @@ if(LLDB_CODESIGN_IDENTITY) endif() if(LLDB_BUILD_FRAMEWORK) - list(APPEND LLDB_TEST_COMMON_ARGS --framework ${LLVM_LIBRARY_OUTPUT_INTDIR}) + list(APPEND LLDB_TEST_COMMON_ARGS --framework ${LLDB_FRAMEWORK_DIR}/LLDB.framework) endif() if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows|Darwin") |
