krytarowski created this revision.
krytarowski added subscribers: lldb-commits, joerg, brucem.
krytarowski set the repository for this revision to rL LLVM.
This approach is tunable with custom paths for curses library.
It also detects whether there are requirements met.
I make use of it on NetBSD.
Repository:
rL LLVM
http://reviews.llvm.org/D14529
Files:
cmake/LLDBDependencies.cmake
cmake/modules/LLDBConfig.cmake
Index: cmake/modules/LLDBConfig.cmake
===================================================================
--- cmake/modules/LLDBConfig.cmake
+++ cmake/modules/LLDBConfig.cmake
@@ -309,7 +309,7 @@
find_library(DEBUG_SYMBOLS_LIBRARY DebugSymbols PATHS
"/System/Library/PrivateFrameworks")
add_definitions( -DLIBXML2_DEFINED )
- list(APPEND system_libs xml2 ncurses panel)
+ list(APPEND system_libs xml2 ${CURSES_LIBRARIES})
list(APPEND system_libs ${CARBON_LIBRARY} ${FOUNDATION_LIBRARY}
${CORE_FOUNDATION_LIBRARY} ${CORE_SERVICES_LIBRARY} ${SECURITY_LIBRARY}
${DEBUG_SYMBOLS_LIBRARY})
@@ -395,3 +395,18 @@
else()
set(LLDB_CAN_USE_DEBUGSERVER 0)
endif()
+
+if (NOT LLDB_DISABLE_CURSES)
+ find_package(Curses REQUIRED)
+
+ find_library(CURSES_PANEL_LIBRARY NAMES panel DOC "The curses panel
library")
+ if (NOT CURSES_PANEL_LIBRARY)
+ message(FATAL_ERROR "A required curses' panel library not found.")
+ endif ()
+
+ # Add panels to the library path
+ set (CURSES_LIBRARIES ${CURSES_LIBRARIES} ${CURSES_PANEL_LIBRARY})
+
+ list(APPEND system_libs ${CURSES_LIBRARIES})
+ include_directories(${CURSES_INCLUDE_DIR})
+endif ()
Index: cmake/LLDBDependencies.cmake
===================================================================
--- cmake/LLDBDependencies.cmake
+++ cmake/LLDBDependencies.cmake
@@ -146,7 +146,7 @@
list(APPEND LLDB_SYSTEM_LIBS edit)
endif()
if (NOT LLDB_DISABLE_CURSES)
- list(APPEND LLDB_SYSTEM_LIBS panel ncurses)
+ list(APPEND LLDB_SYSTEM_LIBS ${CURSES_LIBRARIES})
if(LLVM_ENABLE_TERMINFO AND HAVE_TERMINFO)
list(APPEND LLDB_SYSTEM_LIBS ${TERMINFO_LIBS})
endif()
Index: cmake/modules/LLDBConfig.cmake
===================================================================
--- cmake/modules/LLDBConfig.cmake
+++ cmake/modules/LLDBConfig.cmake
@@ -309,7 +309,7 @@
find_library(DEBUG_SYMBOLS_LIBRARY DebugSymbols PATHS "/System/Library/PrivateFrameworks")
add_definitions( -DLIBXML2_DEFINED )
- list(APPEND system_libs xml2 ncurses panel)
+ list(APPEND system_libs xml2 ${CURSES_LIBRARIES})
list(APPEND system_libs ${CARBON_LIBRARY} ${FOUNDATION_LIBRARY}
${CORE_FOUNDATION_LIBRARY} ${CORE_SERVICES_LIBRARY} ${SECURITY_LIBRARY}
${DEBUG_SYMBOLS_LIBRARY})
@@ -395,3 +395,18 @@
else()
set(LLDB_CAN_USE_DEBUGSERVER 0)
endif()
+
+if (NOT LLDB_DISABLE_CURSES)
+ find_package(Curses REQUIRED)
+
+ find_library(CURSES_PANEL_LIBRARY NAMES panel DOC "The curses panel library")
+ if (NOT CURSES_PANEL_LIBRARY)
+ message(FATAL_ERROR "A required curses' panel library not found.")
+ endif ()
+
+ # Add panels to the library path
+ set (CURSES_LIBRARIES ${CURSES_LIBRARIES} ${CURSES_PANEL_LIBRARY})
+
+ list(APPEND system_libs ${CURSES_LIBRARIES})
+ include_directories(${CURSES_INCLUDE_DIR})
+endif ()
Index: cmake/LLDBDependencies.cmake
===================================================================
--- cmake/LLDBDependencies.cmake
+++ cmake/LLDBDependencies.cmake
@@ -146,7 +146,7 @@
list(APPEND LLDB_SYSTEM_LIBS edit)
endif()
if (NOT LLDB_DISABLE_CURSES)
- list(APPEND LLDB_SYSTEM_LIBS panel ncurses)
+ list(APPEND LLDB_SYSTEM_LIBS ${CURSES_LIBRARIES})
if(LLVM_ENABLE_TERMINFO AND HAVE_TERMINFO)
list(APPEND LLDB_SYSTEM_LIBS ${TERMINFO_LIBS})
endif()
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
