keith created this revision.
keith added reviewers: kastiglione, beanz.
Herald added a subscriber: mgorny.
Previously the framework-header-fix script would change the sources
before they were copied, leading to unnecessary rebuilds on repeat
`ninja lldb` invocations. This runs the script on the headers after
they're copied into the produced LLDB.framework, meaning it doesn't
affect any files being built.
https://reviews.llvm.org/D49779
Files:
cmake/modules/LLDBFramework.cmake
Index: cmake/modules/LLDBFramework.cmake
===================================================================
--- cmake/modules/LLDBFramework.cmake
+++ cmake/modules/LLDBFramework.cmake
@@ -12,9 +12,6 @@
COMMAND ${CMAKE_COMMAND} -E copy ${header}
${CMAKE_CURRENT_BINARY_DIR}/FrameworkHeaders/${basename})
list(APPEND framework_headers
${CMAKE_CURRENT_BINARY_DIR}/FrameworkHeaders/${basename})
endforeach()
-add_custom_target(lldb-framework-headers
- DEPENDS ${framework_headers}
- COMMAND ${LLDB_SOURCE_DIR}/scripts/framework-header-fix.sh
${CMAKE_CURRENT_BINARY_DIR} ${LLDB_VERSION})
if (NOT IOS)
if (NOT LLDB_BUILT_STANDALONE)
@@ -40,6 +37,11 @@
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LLDB_FRAMEWORK_INSTALL_DIR}
PUBLIC_HEADER "${framework_headers}")
+add_custom_target(lldb-framework-headers
+ DEPENDS ${framework_headers}
+ COMMAND ${LLDB_SOURCE_DIR}/scripts/framework-header-fix.sh
+ $<TARGET_FILE_DIR:liblldb>/Headers ${LLDB_VERSION})
+
add_dependencies(lldb-framework
lldb-framework-headers
lldb-suite)
Index: cmake/modules/LLDBFramework.cmake
===================================================================
--- cmake/modules/LLDBFramework.cmake
+++ cmake/modules/LLDBFramework.cmake
@@ -12,9 +12,6 @@
COMMAND ${CMAKE_COMMAND} -E copy ${header} ${CMAKE_CURRENT_BINARY_DIR}/FrameworkHeaders/${basename})
list(APPEND framework_headers ${CMAKE_CURRENT_BINARY_DIR}/FrameworkHeaders/${basename})
endforeach()
-add_custom_target(lldb-framework-headers
- DEPENDS ${framework_headers}
- COMMAND ${LLDB_SOURCE_DIR}/scripts/framework-header-fix.sh ${CMAKE_CURRENT_BINARY_DIR} ${LLDB_VERSION})
if (NOT IOS)
if (NOT LLDB_BUILT_STANDALONE)
@@ -40,6 +37,11 @@
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LLDB_FRAMEWORK_INSTALL_DIR}
PUBLIC_HEADER "${framework_headers}")
+add_custom_target(lldb-framework-headers
+ DEPENDS ${framework_headers}
+ COMMAND ${LLDB_SOURCE_DIR}/scripts/framework-header-fix.sh
+ $<TARGET_FILE_DIR:liblldb>/Headers ${LLDB_VERSION})
+
add_dependencies(lldb-framework
lldb-framework-headers
lldb-suite)
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
