I'm not sure anyone else uses the standalone build, so as long as the changes you're making are confined to LLDBStandalone, it should be fine <br><div class="gmail_quote"><div dir="ltr">On Sat, Apr 30, 2016 at 6:41 PM Kamil Rytarowski <<a href="mailto:n54@gmx.com">n54@gmx.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">krytarowski added a comment.<br>
<br>
If the change should go to LLDBStandalone.cmake -- can I just put there in one go all the bits for standalone builds?<br>
<br>
--- cmake/modules/LLDBStandalone.cmake.orig 2016-04-27 00:55:49.000000000 +0000<br>
+++ cmake/modules/LLDBStandalone.cmake<br>
@@ -2,61 +2,82 @@<br>
# standalone project, using LLVM as an external library:<br>
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)<br>
project(lldb)<br>
- cmake_minimum_required(VERSION 2.8)<br>
+ cmake_minimum_required(VERSION 2.8.12.2)<br>
<br>
option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF)<br>
<br>
- set(LLDB_PATH_TO_LLVM_SOURCE "" CACHE PATH<br>
- "Path to LLVM source code. Not necessary if using an installed LLVM.")<br>
- set(LLDB_PATH_TO_LLVM_BUILD "" CACHE PATH<br>
- "Path to the directory where LLVM was built or installed.")<br>
-<br>
- set(LLDB_PATH_TO_CLANG_SOURCE "" CACHE PATH<br>
- "Path to Clang source code. Not necessary if using an installed Clang.")<br>
- set(LLDB_PATH_TO_CLANG_BUILD "" CACHE PATH<br>
- "Path to the directory where Clang was built or installed.")<br>
-<br>
- if (LLDB_PATH_TO_LLVM_SOURCE)<br>
- if (NOT EXISTS "${LLDB_PATH_TO_LLVM_SOURCE}/cmake/config-ix.cmake")<br>
- message(FATAL_ERROR "Please set LLDB_PATH_TO_LLVM_SOURCE to the root "<br>
- "directory of LLVM source code.")<br>
+ # Rely on llvm-config.<br>
+ set(CONFIG_OUTPUT)<br>
+ find_program(LLVM_CONFIG "llvm-config")<br>
+ if(LLVM_CONFIG)<br>
+ message(STATUS "Found LLVM_CONFIG as ${LLVM_CONFIG}")<br>
+ set(CONFIG_COMMAND ${LLVM_CONFIG}<br>
+ "--assertion-mode"<br>
+ "--bindir"<br>
+ "--libdir"<br>
+ "--includedir"<br>
+ "--prefix"<br>
+ "--src-root")<br>
+ execute_process(<br>
+ COMMAND ${CONFIG_COMMAND}<br>
+ RESULT_VARIABLE HAD_ERROR<br>
+ OUTPUT_VARIABLE CONFIG_OUTPUT<br>
+ )<br>
+ if(NOT HAD_ERROR)<br>
+ string(REGEX REPLACE<br>
+ "[ \t]*[\r\n]+[ \t]*" ";"<br>
+ CONFIG_OUTPUT ${CONFIG_OUTPUT})<br>
+<br>
else()<br>
- get_filename_component(LLVM_MAIN_SRC_DIR ${LLDB_PATH_TO_LLVM_SOURCE}<br>
- ABSOLUTE)<br>
- set(LLVM_MAIN_INCLUDE_DIR "${LLVM_MAIN_SRC_DIR}/include")<br>
- list(APPEND CMAKE_MODULE_PATH "${LLVM_MAIN_SRC_DIR}/cmake/modules")<br>
+ string(REPLACE ";" " " CONFIG_COMMAND_STR "${CONFIG_COMMAND}")<br>
+ message(STATUS "${CONFIG_COMMAND_STR}")<br>
+ message(FATAL_ERROR "llvm-config failed with status ${HAD_ERROR}")<br>
endif()<br>
- endif()<br>
-<br>
- if (LLDB_PATH_TO_CLANG_SOURCE)<br>
- get_filename_component(CLANG_MAIN_SRC_DIR ${LLDB_PATH_TO_CLANG_SOURCE}<br>
- ABSOLUTE)<br>
- set(CLANG_MAIN_INCLUDE_DIR "${CLANG_MAIN_SRC_DIR}/include")<br>
- endif()<br>
-<br>
- list(APPEND CMAKE_MODULE_PATH "${LLDB_PATH_TO_LLVM_BUILD}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")<br>
-<br>
- if (LLDB_PATH_TO_LLVM_BUILD)<br>
- get_filename_component(PATH_TO_LLVM_BUILD ${LLDB_PATH_TO_LLVM_BUILD}<br>
- ABSOLUTE)<br>
else()<br>
- message(FATAL_ERROR "Please set LLDB_PATH_TO_LLVM_BUILD to the root "<br>
- "directory of LLVM build or install site.")<br>
+ message(FATAL_ERROR "llvm-config not found -- ${LLVM_CONFIG}")<br>
endif()<br>
<br>
- if (LLDB_PATH_TO_CLANG_BUILD)<br>
- get_filename_component(PATH_TO_CLANG_BUILD ${LLDB_PATH_TO_CLANG_BUILD}<br>
- ABSOLUTE)<br>
+ list(GET CONFIG_OUTPUT 0 ENABLE_ASSERTIONS)<br>
+ list(GET CONFIG_OUTPUT 1 TOOLS_BINARY_DIR)<br>
+ list(GET CONFIG_OUTPUT 2 LIBRARY_DIR)<br>
+ list(GET CONFIG_OUTPUT 3 INCLUDE_DIR)<br>
+ list(GET CONFIG_OUTPUT 4 LLVM_OBJ_ROOT)<br>
+ list(GET CONFIG_OUTPUT 5 MAIN_SRC_DIR)<br>
+<br>
+ if(NOT MSVC_IDE)<br>
+ set(LLVM_ENABLE_ASSERTIONS ${ENABLE_ASSERTIONS}<br>
+ CACHE BOOL "Enable assertions")<br>
+ # Assertions should follow llvm-config's.<br>
+ mark_as_advanced(LLVM_ENABLE_ASSERTIONS)<br>
+ endif()<br>
+<br>
+ set(LLVM_TOOLS_BINARY_DIR ${TOOLS_BINARY_DIR} CACHE PATH "Path to llvm/bin")<br>
+ set(LLVM_LIBRARY_DIR ${LIBRARY_DIR} CACHE PATH "Path to llvm/lib")<br>
+ set(LLVM_MAIN_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to llvm/include")<br>
+ set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree")<br>
+ set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree")<br>
+<br>
+ find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR}<br>
+ NO_DEFAULT_PATH)<br>
+<br>
+ set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")<br>
+ set(LLVMCONFIG_FILE "${LLVM_CMAKE_PATH}/LLVMConfig.cmake")<br>
+ if(EXISTS ${LLVMCONFIG_FILE})<br>
+ list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_PATH}")<br>
+ include(${LLVMCONFIG_FILE})<br>
else()<br>
- message(FATAL_ERROR "Please set LLDB_PATH_TO_CLANG_BUILD to the root "<br>
- "directory of Clang build or install site.")<br>
+ message(FATAL_ERROR "Not found: ${LLVMCONFIG_FILE}")<br>
endif()<br>
<br>
-<br>
- # These variables are used by add_llvm_library.<br>
+ # They are used as destination of target generators.<br>
set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin)<br>
set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX})<br>
- set(LLVM_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})<br>
+ if(WIN32 OR CYGWIN)<br>
+ # DLL platform -- put DLLs into bin.<br>
+ set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})<br>
+ else()<br>
+ set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_LIBRARY_OUTPUT_INTDIR})<br>
+ endif()<br>
<br>
include(AddLLVM)<br>
include(HandleLLVMOptions)<br>
@@ -73,23 +94,16 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR<br>
message("-- Found PythonInterp: ${PYTHON_EXECUTABLE}")<br>
endif()<br>
# Import CMake library targets from LLVM and Clang.<br>
- include("${LLDB_PATH_TO_LLVM_BUILD}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm/LLVMConfig.cmake")<br>
- if (EXISTS "${LLDB_PATH_TO_CLANG_BUILD}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")<br>
- include("${LLDB_PATH_TO_CLANG_BUILD}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")<br>
- endif()<br>
+ include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm/LLVMConfig.cmake")<br>
+ include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")<br>
<br>
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")<br>
<br>
set(LLVM_BINARY_DIR ${CMAKE_BINARY_DIR})<br>
<br>
set(CMAKE_INCLUDE_CURRENT_DIR ON)<br>
- include_directories("${PATH_TO_LLVM_BUILD}/include"<br>
- "${LLVM_MAIN_INCLUDE_DIR}"<br>
- "${PATH_TO_CLANG_BUILD}/include"<br>
- "${CLANG_MAIN_INCLUDE_DIR}"<br>
- "${CMAKE_CURRENT_SOURCE_DIR}/source")<br>
- link_directories("${PATH_TO_LLVM_BUILD}/lib${LLVM_LIBDIR_SUFFIX}"<br>
- "${PATH_TO_CLANG_BUILD}/lib${LLVM_LIBDIR_SUFFIX}")<br>
+ include_directories("${LLVM_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}")<br>
+ link_directories("${LLVM_LIBRARY_DIR}")<br>
<br>
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)<br>
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX})<br>
<br>
This patch is anyway cherry-picked from NetBSD by vendors like Red Hat or Mageia.<br>
<br>
There is only need to fix pending regex support - for now I'm using the hack from <a href="http://reviews.llvm.org/D15067" rel="noreferrer" target="_blank">http://reviews.llvm.org/D15067</a> locally, and once I will get more subsystems to build and test I will be able to finish it cleanly.<br>
<br>
<br>
Repository:<br>
rL LLVM<br>
<br>
<a href="http://reviews.llvm.org/D19772" rel="noreferrer" target="_blank">http://reviews.llvm.org/D19772</a><br>
<br>
<br>
<br>
</blockquote></div>