diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-01-26 06:18:56 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-01-26 06:18:56 +0000 |
| commit | a81d9af293825531ac7ae24e1b280959d683b58b (patch) | |
| tree | 0bb212245a73e24b0078db5ca1108926f0e43c87 /cmake | |
| parent | 742f5b57c46be5c2159c1bec59b9752825c63bfa (diff) | |
| download | llvm-a81d9af293825531ac7ae24e1b280959d683b58b.tar.gz llvm-a81d9af293825531ac7ae24e1b280959d683b58b.tar.bz2 llvm-a81d9af293825531ac7ae24e1b280959d683b58b.tar.xz | |
[CMake] configure_lit_site_cfg: ${SHLIBDIR} should point the build tree.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200134 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/AddLLVM.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index f1bed5e791..2b985c237e 100644 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake @@ -436,11 +436,15 @@ function(configure_lit_site_cfg input output) set(LLVM_BUILD_MODE "%(build_mode)s") endif () + # They below might not be the build tree but provided binary tree. set(LLVM_SOURCE_DIR ${LLVM_MAIN_SRC_DIR}) set(LLVM_BINARY_DIR ${LLVM_BINARY_DIR}) string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLVM_TOOLS_DIR ${LLVM_TOOLS_BINARY_DIR}) string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLVM_LIBS_DIR ${LLVM_LIBRARY_DIR}) - string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} SHLIBDIR ${LLVM_LIBRARY_DIR}) + + # SHLIBDIR points the build tree. + string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} SHLIBDIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) + set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE}) set(ENABLE_SHARED ${LLVM_SHARED_LIBS_ENABLED}) set(SHLIBPATH_VAR ${SHLIBPATH_VAR}) |