106 lines
4.9 KiB
Diff
106 lines
4.9 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index c27beec313d7..480f13e73c9f 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -78,15 +78,17 @@ if(CLANG_BUILT_STANDALONE)
|
|
if (NOT LLVM_CONFIG_FOUND)
|
|
# Pull values from LLVMConfig.cmake. We can drop this once the llvm-config
|
|
# path is removed.
|
|
- set(MAIN_INCLUDE_DIR "${LLVM_INCLUDE_DIR}")
|
|
+ set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
|
|
set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}")
|
|
# N.B. this is just a default value, the CACHE PATHs below can be overriden.
|
|
set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm")
|
|
set(TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR}")
|
|
set(LIBRARY_DIR "${LLVM_LIBRARY_DIR}")
|
|
+ else()
|
|
+ set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}")
|
|
endif()
|
|
|
|
- set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include")
|
|
+ set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed")
|
|
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_TOOLS_BINARY_DIR "${TOOLS_BINARY_DIR}" CACHE PATH "Path to llvm/bin")
|
|
@@ -128,7 +130,7 @@ if(CLANG_BUILT_STANDALONE)
|
|
set(LLVM_INCLUDE_TESTS ON)
|
|
endif()
|
|
|
|
- include_directories("${LLVM_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}")
|
|
+ include_directories(${LLVM_INCLUDE_DIRS})
|
|
link_directories("${LLVM_LIBRARY_DIR}")
|
|
|
|
set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
|
|
diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake
|
|
index 21ac332e4f5f..b16c314bd1e2 100644
|
|
--- a/cmake/modules/AddClang.cmake
|
|
+++ b/cmake/modules/AddClang.cmake
|
|
@@ -119,8 +119,8 @@ macro(add_clang_library name)
|
|
install(TARGETS ${lib}
|
|
COMPONENT ${lib}
|
|
${export_to_clangtargets}
|
|
- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
|
|
- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
|
|
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}"
|
|
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}"
|
|
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
|
|
|
|
if (NOT LLVM_ENABLE_IDE)
|
|
diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt
|
|
index 6e2060991b92..b9bc930d26b8 100644
|
|
--- a/lib/Headers/CMakeLists.txt
|
|
+++ b/lib/Headers/CMakeLists.txt
|
|
@@ -420,7 +420,7 @@ add_header_target("openmp-resource-headers" ${openmp_wrapper_files})
|
|
add_header_target("windows-resource-headers" ${windows_only_files})
|
|
add_header_target("utility-resource-headers" ${utility_files})
|
|
|
|
-set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)
|
|
+set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)
|
|
|
|
#############################################################
|
|
# Install rules for the catch-all clang-resource-headers target
|
|
diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt
|
|
index 8d95d0900e8c..ebc70ff7526d 100644
|
|
--- a/tools/libclang/CMakeLists.txt
|
|
+++ b/tools/libclang/CMakeLists.txt
|
|
@@ -180,7 +180,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS})
|
|
COMPONENT
|
|
libclang-python-bindings
|
|
DESTINATION
|
|
- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages")
|
|
+ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages")
|
|
endforeach()
|
|
if(NOT LLVM_ENABLE_IDE)
|
|
add_custom_target(libclang-python-bindings)
|
|
diff --git a/tools/scan-build-py/CMakeLists.txt b/tools/scan-build-py/CMakeLists.txt
|
|
index 061dc7ef4dd9..adc54b2edc32 100644
|
|
--- a/tools/scan-build-py/CMakeLists.txt
|
|
+++ b/tools/scan-build-py/CMakeLists.txt
|
|
@@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild})
|
|
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib})
|
|
list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib})
|
|
install(PROGRAMS lib/libscanbuild/${lib}
|
|
- DESTINATION lib/libscanbuild
|
|
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild"
|
|
COMPONENT scan-build-py)
|
|
endforeach()
|
|
|
|
@@ -106,7 +106,7 @@ foreach(resource ${LibScanbuildResources})
|
|
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource})
|
|
list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource})
|
|
install(PROGRAMS lib/libscanbuild/resources/${resource}
|
|
- DESTINATION lib/libscanbuild/resources
|
|
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources"
|
|
COMPONENT scan-build-py)
|
|
endforeach()
|
|
|
|
@@ -122,7 +122,7 @@ foreach(lib ${LibEar})
|
|
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib})
|
|
list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib})
|
|
install(PROGRAMS lib/libear/${lib}
|
|
- DESTINATION lib/libear
|
|
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear"
|
|
COMPONENT scan-build-py)
|
|
endforeach()
|
|
|