[llvm-branch-commits] [lldb] r240293 - Merging r231423:

[Tom Stellard]

Author: tstellar
Date: Mon Jun 22 11:43:42 2015
New Revision: 240293

URL: http://llvm.org/viewvc/llvm-project?rev=240293&view=rev
Log:
Merging r231423:
------------------------------------------------------------------------
r231423 | chaoren | 2015-03-05 18:22:54 -0500 (Thu, 05 Mar 2015) | 7 lines

Remove libedit and libncurses from LLDB_SYSTEM_LIBS if they're disabled.

Reviewers: clayborg, zturner, vharron, sbest

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D8065
------------------------------------------------------------------------

Differential Revision: http://reviews.llvm.org/D10323

Modified:
    lldb/branches/release_36/cmake/LLDBDependencies.cmake

Modified: lldb/branches/release_36/cmake/LLDBDependencies.cmake
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_36/cmake/LLDBDependencies.cmake?rev=240293&r1=240292&r2=240293&view=diff
==============================================================================
--- lldb/branches/release_36/cmake/LLDBDependencies.cmake (original)
+++ lldb/branches/release_36/cmake/LLDBDependencies.cmake Mon Jun 22 11:43:42 2015
@@ -132,7 +132,12 @@ set( CLANG_USED_LIBS
 
 set(LLDB_SYSTEM_LIBS)
 if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows" AND NOT __ANDROID_NDK__)
-  list(APPEND LLDB_SYSTEM_LIBS edit panel ncurses)
+  if (NOT LLDB_DISABLE_LIBEDIT)
+    list(APPEND LLDB_SYSTEM_LIBS edit)
+  endif()
+  if (NOT LLDB_DISABLE_CURSES)
+    list(APPEND LLDB_SYSTEM_LIBS panel ncurses)
+  endif()
 endif()
 # On FreeBSD backtrace() is provided by libexecinfo, not libc.
 if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")