diff options
| author | Michal Gorny <mgorny@gentoo.org> | 2017-01-09 23:31:05 +0000 |
|---|---|---|
| committer | Michal Gorny <mgorny@gentoo.org> | 2017-01-09 23:31:05 +0000 |
| commit | db2e8acccf70386ebb9b9446f6dded5a6fb3e2d7 (patch) | |
| tree | 2d773c6de75bc5b7f7bfd4b09d9182e2ccf048f1 | |
| parent | 33f27fd84247ba838f354a73f915d2278da33a6b (diff) | |
| download | bcm5719-llvm-db2e8acccf70386ebb9b9446f6dded5a6fb3e2d7.tar.gz bcm5719-llvm-db2e8acccf70386ebb9b9446f6dded5a6fb3e2d7.zip | |
[cmake] Obtain LLVM_CMAKE_PATH from llvm-config if available
Use the new --cmakedir option to obtain LLVM_CMAKE_PATH straight from
llvm-config. Fallback to local reconstruction if llvm-config does not
support this option.
llvm-svn: 291506
| -rw-r--r-- | libcxxabi/CMakeLists.txt | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt index 2aefd79c240..05f76ab3a43 100644 --- a/libcxxabi/CMakeLists.txt +++ b/libcxxabi/CMakeLists.txt @@ -49,8 +49,19 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) set(LLVM_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to llvm/include") set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree") set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree") - set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") set(LLVM_LIT_PATH "${LLVM_PATH}/utils/lit/lit.py") + + # --cmakedir is supported since llvm r291218 (4.0 release) + execute_process( + COMMAND ${LLVM_CONFIG_PATH} --cmakedir + RESULT_VARIABLE HAD_ERROR + OUTPUT_VARIABLE CONFIG_OUTPUT) + if(NOT HAD_ERROR) + string(STRIP "${CONFIG_OUTPUT}" LLVM_CMAKE_PATH) + else() + set(LLVM_CMAKE_PATH + "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") + endif() else() message(FATAL_ERROR "llvm-config not found and LLVM_MAIN_SRC_DIR not defined. " "Reconfigure with -DLLVM_CONFIG_PATH=path/to/llvm-config " |
