diff options
| author | Pavel Labath <labath@google.com> | 2015-07-17 15:50:48 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2015-07-17 15:50:48 +0000 |
| commit | 6512cad8e50542aafaf1c0c5a96dca80e800b45f (patch) | |
| tree | 4f22dbb0d497daa675ec7c729b72d0db47ad1756 | |
| parent | 69718d242a1ac9b5433ae250186207aef9e4c0b7 (diff) | |
| download | bcm5719-llvm-6512cad8e50542aafaf1c0c5a96dca80e800b45f.tar.gz bcm5719-llvm-6512cad8e50542aafaf1c0c5a96dca80e800b45f.zip | |
Standalone cmake build improvements (bug #23889)
patch by Eugene Zelenko.
llvm-svn: 242529
| -rw-r--r-- | lldb/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | lldb/cmake/modules/LLDBStandalone.cmake | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt index 02b7d6ab1ab..f29922652c8 100644 --- a/lldb/CMakeLists.txt +++ b/lldb/CMakeLists.txt @@ -1,5 +1,7 @@ -include(cmake/modules/LLDBConfig.cmake) +cmake_minimum_required(VERSION 2.8) + include(cmake/modules/LLDBStandalone.cmake) +include(cmake/modules/LLDBConfig.cmake) include(cmake/modules/AddLLDB.cmake) #add_subdirectory(include) @@ -13,7 +15,6 @@ add_subdirectory(tools) add_subdirectory(unittests) add_subdirectory(lit) - if ( LLDB_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION AND NOT LLDB_DISABLE_PYTHON ) # Add a Post-Build Event to copy over Python files and create the symlink to liblldb.so for the Python API(hardlink on Windows) add_custom_target( finish_swig ALL diff --git a/lldb/cmake/modules/LLDBStandalone.cmake b/lldb/cmake/modules/LLDBStandalone.cmake index e5f781e6865..72543ce9109 100644 --- a/lldb/cmake/modules/LLDBStandalone.cmake +++ b/lldb/cmake/modules/LLDBStandalone.cmake @@ -43,6 +43,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) # These variables are used by add_llvm_library. set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) + set(LLVM_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) include(AddLLVM) include(HandleLLVMOptions) |
