diff options
| author | Petr Hosek <phosek@chromium.org> | 2016-11-08 23:02:49 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2016-11-08 23:02:49 +0000 |
| commit | ac0ec7b278171462ccce325549be9c16cdb07e6c (patch) | |
| tree | b09dce4252ad9ae97d9cb1938f060ae7c62cb46d /libunwind/CMakeLists.txt | |
| parent | 48095826cddc77606c415f6db18f7a01c5306939 (diff) | |
[CMake] Get libunwind building under LLVM/runtimes
The new LLVM runtimes directory requires the same conventions to be
followed across the runtime projects. These changes make libunwind
build under the runtimes subdirectory.
This patch contains the following changes:
* Rename LLVM_CONFIG to LLVM_CONFIG_PATH
* Check if compiler supports C++11 (required by libunwind)
Differential Revision: https://reviews.llvm.org/D26360
Diffstat (limited to 'libunwind/CMakeLists.txt')
| -rw-r--r-- | libunwind/CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt index 1048156202d..4dc6a539dbc 100644 --- a/libunwind/CMakeLists.txt +++ b/libunwind/CMakeLists.txt @@ -13,15 +13,17 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) # Rely on llvm-config. set(CONFIG_OUTPUT) - find_program(LLVM_CONFIG "llvm-config") + if(NOT LLVM_CONFIG_PATH) + find_program(LLVM_CONFIG_PATH "llvm-config") + endif() if (DEFINED LLVM_PATH) set(LLVM_INCLUDE_DIR ${LLVM_INCLUDE_DIR} CACHE PATH "Path to llvm/include") set(LLVM_PATH ${LLVM_PATH} CACHE PATH "Path to LLVM source tree") set(LLVM_MAIN_SRC_DIR ${LLVM_PATH}) set(LLVM_CMAKE_PATH "${LLVM_PATH}/cmake/modules") - elseif (LLVM_CONFIG) - message(STATUS "Found LLVM_CONFIG as ${LLVM_CONFIG}") - set(CONFIG_COMMAND ${LLVM_CONFIG} "--includedir" "--prefix" "--src-root") + elseif(LLVM_CONFIG_PATH) + message(STATUS "Found LLVM_CONFIG_PATH as ${LLVM_CONFIG_PATH}") + set(CONFIG_COMMAND ${LLVM_CONFIG_PATH} "--includedir" "--prefix" "--src-root") execute_process(COMMAND ${CONFIG_COMMAND} RESULT_VARIABLE HAD_ERROR OUTPUT_VARIABLE CONFIG_OUTPUT) |