[PATCH] D114437: [Support][CMake] Fix exposed absolute path dependency of terminfo library

[xndcn via Phabricator via llvm-commits]

xndcn updated this revision to Diff 390267.

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D114437/new/

https://reviews.llvm.org/D114437

Files:
  llvm/cmake/config-ix.cmake
  llvm/cmake/modules/LLVMConfig.cmake.in
  llvm/lib/Support/CMakeLists.txt


Index: llvm/lib/Support/CMakeLists.txt
===================================================================
--- llvm/lib/Support/CMakeLists.txt
+++ llvm/lib/Support/CMakeLists.txt
@@ -45,7 +45,7 @@
     set(system_libs ${system_libs} ${Backtrace_LIBFILE})
   endif()
   if( LLVM_ENABLE_TERMINFO )
-    set(imported_libs ${imported_libs} "${TERMINFO_LIB}")
+    set(imported_libs ${imported_libs} LibTerminfo)
   endif()
   if( LLVM_ENABLE_THREADS AND (HAVE_LIBATOMIC OR HAVE_CXX_LIBATOMICS64) )
     set(system_libs ${system_libs} atomic)
Index: llvm/cmake/modules/LLVMConfig.cmake.in
===================================================================
--- llvm/cmake/modules/LLVMConfig.cmake.in
+++ llvm/cmake/modules/LLVMConfig.cmake.in
@@ -51,6 +51,11 @@
 set(LLVM_ENABLE_RTTI @LLVM_ENABLE_RTTI@)

 set(LLVM_ENABLE_TERMINFO @LLVM_ENABLE_TERMINFO@)
+if(LLVM_ENABLE_TERMINFO)
+  find_library(TERMINFO_LIB @TERMINFO_LIB_NAME@ HINTS @TERMINFO_LIB_DIR@ REQUIRED)
+  add_library(LibTerminfo INTERFACE IMPORTED)
+  target_link_libraries(LibTerminfo INTERFACE ${TERMINFO_LIB})
+endif()

 set(LLVM_ENABLE_THREADS @LLVM_ENABLE_THREADS@)

Index: llvm/cmake/config-ix.cmake
===================================================================
--- llvm/cmake/config-ix.cmake
+++ llvm/cmake/config-ix.cmake
@@ -13,6 +13,7 @@

 include(CheckCompilerVersion)
 include(HandleLLVMStdlib)
+include(GetLibraryName)

 if( UNIX AND NOT (APPLE OR BEOS OR HAIKU) )
   # Used by check_symbol_exists:
@@ -198,6 +199,10 @@
     endif()
     if(LLVM_ENABLE_TERMINFO)
       find_library(TERMINFO_LIB NAMES terminfo tinfo curses ncurses ncursesw ${MAYBE_REQUIRED})
+      get_library_name(${TERMINFO_LIB} TERMINFO_LIB_NAME)
+      get_filename_component(TERMINFO_LIB_DIR ${TERMINFO_LIB} DIRECTORY)
+      add_library(LibTerminfo INTERFACE IMPORTED)
+      target_link_libraries(LibTerminfo INTERFACE ${TERMINFO_LIB})
     endif()
     if(TERMINFO_LIB)
       set(LLVM_ENABLE_TERMINFO 1)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D114437.390267.patch
Type: text/x-patch
Size: 1959 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20211129/e678272d/attachment.bin>