diff options
| author | Vassil Vassilev <v.g.vassilev@gmail.com> | 2016-06-11 17:20:53 +0000 |
|---|---|---|
| committer | Vassil Vassilev <v.g.vassilev@gmail.com> | 2016-06-11 17:20:53 +0000 |
| commit | 62bc28788bfda334794f27d8db70e4a00a39cce2 (patch) | |
| tree | bb7a1e8ad0ef3b2b4c79e3c2f2ec8792cd3dd24b /cmake | |
| parent | d1fd57765b78eaad11acad79d17b4703b67a9d71 (diff) | |
[CMake] Allow LLVM to be embedded and built in a subfolder as part of another project.
Patch by Bertrand Bellenot!
Reviewed by Chris Bieneman and me.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@272481 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
| -rwxr-xr-x | cmake/config-ix.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index a40dddfc1c8..400ce32f835 100755 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -410,12 +410,12 @@ else () set(LLVM_NATIVE_ASMPRINTER LLVMInitialize${LLVM_NATIVE_ARCH}AsmPrinter) # We don't have an ASM parser for all architectures yet. - if (EXISTS ${CMAKE_SOURCE_DIR}/lib/Target/${LLVM_NATIVE_ARCH}/AsmParser/CMakeLists.txt) + if (EXISTS ${PROJECT_SOURCE_DIR}/lib/Target/${LLVM_NATIVE_ARCH}/AsmParser/CMakeLists.txt) set(LLVM_NATIVE_ASMPARSER LLVMInitialize${LLVM_NATIVE_ARCH}AsmParser) endif () # We don't have an disassembler for all architectures yet. - if (EXISTS ${CMAKE_SOURCE_DIR}/lib/Target/${LLVM_NATIVE_ARCH}/Disassembler/CMakeLists.txt) + if (EXISTS ${PROJECT_SOURCE_DIR}/lib/Target/${LLVM_NATIVE_ARCH}/Disassembler/CMakeLists.txt) set(LLVM_NATIVE_DISASSEMBLER LLVMInitialize${LLVM_NATIVE_ARCH}Disassembler) endif () endif () @@ -526,7 +526,7 @@ else() if(GO_EXECUTABLE STREQUAL "GO_EXECUTABLE-NOTFOUND") message(STATUS "Go bindings disabled.") else() - execute_process(COMMAND ${GO_EXECUTABLE} run ${CMAKE_SOURCE_DIR}/bindings/go/conftest.go + execute_process(COMMAND ${GO_EXECUTABLE} run ${PROJECT_SOURCE_DIR}/bindings/go/conftest.go RESULT_VARIABLE GO_CONFTEST) if(GO_CONFTEST STREQUAL "0") set(LLVM_BINDINGS "${LLVM_BINDINGS} go") |