[llvm-branch-commits] [lldb] ddd39ae - [lldb/CMake] Fix `install` for multi-configuration generators.

Aaron Smith via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Thu Mar 26 10:34:04 PDT 2020


Author: Aaron Smith
Date: 2020-03-26T10:30:43-07:00
New Revision: ddd39ae9b45eca922d7f7386f4deea20c4efce28

URL: https://github.com/llvm/llvm-project/commit/ddd39ae9b45eca922d7f7386f4deea20c4efce28
DIFF: https://github.com/llvm/llvm-project/commit/ddd39ae9b45eca922d7f7386f4deea20c4efce28.diff

LOG: [lldb/CMake] Fix `install` for multi-configuration generators.

Summary: For multi-generator builds like MSVC and Xcode, the install source and destination of the `lldb-python-scripts` target contains configuration dependent paths and therefore need to be substituted.

Reviewers: stella.stamenova, NathanielMcVicar

Reviewed By: NathanielMcVicar

Subscribers: mgorny, lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D76827

Added: 
    

Modified: 
    lldb/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt
index 00b06119d64a..7e8890da0204 100644
--- a/lldb/CMakeLists.txt
+++ b/lldb/CMakeLists.txt
@@ -224,6 +224,8 @@ if (LLDB_ENABLE_PYTHON)
   else()
     set(LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_RELATIVE_PATH})
   endif()
+  string(REPLACE ${CMAKE_CFG_INTDIR} "\$\{CMAKE_INSTALL_CONFIG_NAME\}" LLDB_PYTHON_INSTALL_PATH ${LLDB_PYTHON_INSTALL_PATH})
+  string(REPLACE ${CMAKE_CFG_INTDIR} "\$\{CMAKE_INSTALL_CONFIG_NAME\}" lldb_python_build_path ${lldb_python_build_path})
   add_custom_target(lldb-python-scripts)
   add_dependencies(lldb-python-scripts finish_swig)
   install(DIRECTORY ${lldb_python_build_path}/../


        


More information about the llvm-branch-commits mailing list