[Lldb-commits] [lldb] r194363 - Fix CMake standalone build.

[Peter Collingbourne]

Author: pcc
Date: Sun Nov 10 22:46:09 2013
New Revision: 194363

URL: http://llvm.org/viewvc/llvm-project?rev=194363&view=rev
Log:
Fix CMake standalone build.

Modified:
    lldb/trunk/CMakeLists.txt
    lldb/trunk/source/CMakeLists.txt

Modified: lldb/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/CMakeLists.txt?rev=194363&r1=194362&r2=194363&view=diff
==============================================================================
--- lldb/trunk/CMakeLists.txt (original)
+++ lldb/trunk/CMakeLists.txt Sun Nov 10 22:46:09 2013
@@ -1,3 +1,11 @@
+if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
+  set(LLDB_DEFAULT_DISABLE_PYTHON 1)
+else()
+  set(LLDB_DEFAULT_DISABLE_PYTHON 0)
+endif()
+set(LLDB_DISABLE_PYTHON ${LLDB_DEFAULT_DISABLE_PYTHON} CACHE BOOL
+  "Disables the Python scripting integration.")
+
 # If we are not building as a part of LLVM, build LLDB as an
 # standalone project, using LLVM as an external library:
 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
@@ -14,8 +22,6 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
   set(LLDB_PATH_TO_CLANG_BUILD "" CACHE PATH
     "Path to the directory where Clang was built or installed.")    
 
-  set(LLDB_DISABLE_PYTHON 1 BOOL "Disables the Python scripting integration.")
-
   if (LLDB_PATH_TO_LLVM_SOURCE)
     if (NOT EXISTS "${LLDB_PATH_TO_LLVM_SOURCE}/cmake/config-ix.cmake")
       message(FATAL_ERROR "Please set LLDB_PATH_TO_LLVM_SOURCE to the root "
@@ -65,15 +71,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
   set(LLDB_BUILT_STANDALONE 1)
-  
-  if (LLDB_DISABLE_PYTHON)
-    add_definitions( -DLLDB_DISABLE_PYTHON )
-  endif() 
 endif()
 
-if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
+if (LLDB_DISABLE_PYTHON)
   add_definitions( -DLLDB_DISABLE_PYTHON )
-endif ()
+endif()
 
 macro(add_lldb_definitions)
   # We don't want no semicolons on LLDB_DEFINITIONS:

Modified: lldb/trunk/source/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/CMakeLists.txt?rev=194363&r1=194362&r2=194363&view=diff
==============================================================================
--- lldb/trunk/source/CMakeLists.txt (original)
+++ lldb/trunk/source/CMakeLists.txt Sun Nov 10 22:46:09 2013
@@ -162,6 +162,7 @@ set( LLVM_LINK_COMPONENTS
   core
   mcdisassembler
   executionengine
+  option
   )
 
 set_source_files_properties(${LLDB_BINARY_DIR}/scripts/LLDBWrapPython.cpp PROPERTIES GENERATED 1)