diff options
| author | Jonas Hahnfeld <Hahnfeld@itc.rwth-aachen.de> | 2017-05-04 06:04:49 +0000 |
|---|---|---|
| committer | Jonas Hahnfeld <Hahnfeld@itc.rwth-aachen.de> | 2017-05-04 06:04:49 +0000 |
| commit | 57aa0d42d9b1bc0a640c2711d5116bf042f72133 (patch) | |
| tree | 5e06b53dd9e6cbfa9e54824fa93de25ea4224f38 /libcxxabi | |
| parent | 98a7f2798db8a5445ead5cf251f45ae8d403001a (diff) | |
| download | llvm-57aa0d42d9b1bc0a640c2711d5116bf042f72133.zip llvm-57aa0d42d9b1bc0a640c2711d5116bf042f72133.tar.gz llvm-57aa0d42d9b1bc0a640c2711d5116bf042f72133.tar.bz2 | |
[libcxxabi][CMake] Set library dir when built under runtimes/
This will put libraries into the build root's lib/ directory by default.
Differential Revision: https://reviews.llvm.org/D32735
llvm-svn: 302118
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt index 505cbfc..349e613 100644 --- a/libcxxabi/CMakeLists.txt +++ b/libcxxabi/CMakeLists.txt @@ -239,7 +239,11 @@ set(CMAKE_MODULE_PATH set(LIBCXXABI_COMPILER ${CMAKE_CXX_COMPILER}) set(LIBCXXABI_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(LIBCXXABI_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) -set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) +if (LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) +else() + set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) +endif() set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR}) |