Merge pull request #29404 from compnerd/edit-your-patterns

build: add imported library for libedit

Author: compnerd

cmake/modules/FindLibEdit.cmake

@@ -59,6 +59,12 @@ else()
                                       LibEdit_LIBRARIES
                                     VERSION_VAR
                                       LibEdit_VERSION_STRING)
-  mark_as_advanced(LibEdit_INCLUDE_DIRS LibEdit_LIBRARIES)
 endif()
 
+if(LibEdit_FOUND AND NOT TARGET libedit)
+  add_library(libedit UNKNOWN IMPORTED)
+  set_target_properties(libedit PROPERTIES
+    IMPORTED_LOCATION ${LibEdit_LIBRARIES}
+    INTERFACE_INCLUDE_DIRECTORIES ${LibEdit_INCLUDE_DIRS})
+endif()
+mark_as_advanced(LibEdit_INCLUDE_DIRS LibEdit_LIBRARIES)

lib/Immediate/CMakeLists.txt

@@ -16,5 +16,5 @@ if(LibEdit_FOUND AND LibEdit_HAS_UNICODE)
   target_compile_definitions(swiftImmediate PRIVATE
     HAVE_LIBEDIT)
   target_link_libraries(swiftImmediate PRIVATE
-    ${LibEdit_LIBRARIES})
+    libedit)
 endif()

tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt

@@ -12,10 +12,8 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
     dispatch
     BlocksRuntime)
 endif()
-target_include_directories(sourcekitd-repl PRIVATE
-  ${LibEdit_INCLUDE_DIRS})
 target_link_libraries(sourcekitd-repl PRIVATE
-  ${LibEdit_LIBRARIES})
+  libedit)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set_target_properties(sourcekitd-repl