[Lldb-commits] [lldb] r367005 - [lldb][CMake] Fix framework-enabled build detail for Xcode

Stefan Granitz via lldb-commits lldb-commits at lists.llvm.org
Thu Jul 25 03:47:50 PDT 2019


Author: stefan.graenitz
Date: Thu Jul 25 03:47:49 2019
New Revision: 367005

URL: http://llvm.org/viewvc/llvm-project?rev=367005&view=rev
Log:
[lldb][CMake] Fix framework-enabled build detail for Xcode

If debugserver or any other framework tool gets built first, its post-build copy operation was using 'Resources' as the file name instead of the destination directory. It was not a problem with Ninja, because here the framework structure was alreaady created at configuration time. With this fix, both generators are happy.

Modified:
    lldb/trunk/cmake/modules/AddLLDB.cmake

Modified: lldb/trunk/cmake/modules/AddLLDB.cmake
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/AddLLDB.cmake?rev=367005&r1=367004&r2=367005&view=diff
==============================================================================
--- lldb/trunk/cmake/modules/AddLLDB.cmake (original)
+++ lldb/trunk/cmake/modules/AddLLDB.cmake Thu Jul 25 03:47:49 2019
@@ -204,7 +204,7 @@ function(lldb_add_to_buildtree_lldb_fram
   # Destination for the copy in the build-tree. While the framework target may
   # not exist yet, it will exist when the generator expression gets expanded.
   get_target_property(framework_build_dir liblldb LIBRARY_OUTPUT_DIRECTORY)
-  set(copy_dest "${framework_build_dir}/${subdir}")
+  set(copy_dest "${framework_build_dir}/${subdir}/$<TARGET_FILE_NAME:${name}>")
 
   # Copy into the given subdirectory for testing.
   add_custom_command(TARGET ${name} POST_BUILD




More information about the lldb-commits mailing list