Skip to content

Commit

Permalink
Fix standalone LLDB build, when LLVM/Clang were built with LLVM_INSTA…
Browse files Browse the repository at this point in the history
…LL_TOOLCHAIN_ONLY=ON.

Fix standalone build with CMake 2.8.12.2.

Differential revision: http://reviews.llvm.org/D20344

llvm-svn: 269996
  • Loading branch information
EugeneZelenko committed May 18, 2016
1 parent f16376b commit 000752f
Showing 1 changed file with 19 additions and 1 deletion.
20 changes: 19 additions & 1 deletion lldb/cmake/modules/LLDBStandalone.cmake
Expand Up @@ -4,6 +4,10 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
project(lldb)
cmake_minimum_required(VERSION 2.8.12.2)

if (POLICY CMP0022)
cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required
endif()

option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF)

# Rely on llvm-config.
Expand Down Expand Up @@ -96,14 +100,28 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)

# Import CMake library targets from LLVM and Clang.
include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm/LLVMConfig.cmake")
include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")
# cmake/clang/ClangConfig.cmake is not created when LLVM and Cland are built together.
if (EXISTS "${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")
include("${LLVM_OBJ_ROOT}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang/ClangConfig.cmake")
endif()

set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")

set(LLVM_BINARY_DIR ${CMAKE_BINARY_DIR})

set(CMAKE_INCLUDE_CURRENT_DIR ON)
include_directories("${LLVM_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}")
# Next three include directories are needed when llvm-config is located in build directory.
# LLVM and Cland are assumed to be built together
if (EXISTS "${LLVM_OBJ_ROOT}/include")
include_directories("${LLVM_OBJ_ROOT}/include")
endif()
if (EXISTS "${LLVM_MAIN_SRC_DIR}/tools/clang/include")
include_directories("${LLVM_MAIN_SRC_DIR}/tools/clang/include")
endif()
if (EXISTS "${LLVM_OBJ_ROOT}/tools/clang/include")
include_directories("${LLVM_OBJ_ROOT}/tools/clang/include")
endif()
link_directories("${LLVM_LIBRARY_DIR}")

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
Expand Down

0 comments on commit 000752f

Please sign in to comment.