This is an archive of the discontinued LLVM Phabricator instance.

Differential D32735

[libcxxabi][CMake] Set library dir when built under runtimes/
ClosedPublic

Authored by Hahnfeld on May 2 2017, 12:28 AM.

Details

Reviewers
beanz
chandlerc
EricWF
Commits
rG57aa0d42d9b1: [libcxxabi][CMake] Set library dir when built under runtimes/
rCXXA302118: [libcxxabi][CMake] Set library dir when built under runtimes/
rL302118: [libcxxabi][CMake] Set library dir when built under runtimes/
Summary

This will put libraries into the build root's lib/ directory by default.

Diff Detail

Repository
rL LLVM

Event Timeline

Hahnfeld created this revision.May 2 2017, 12:28 AM
Herald added a reviewer: EricWF. · View Herald TranscriptMay 2 2017, 12:28 AM
Herald added a subscriber: mgorny. · View Herald Transcript
EricWF accepted this revision.May 3 2017, 2:18 PM
This revision is now accepted and ready to land.May 3 2017, 2:18 PM
Closed by commit rL302118: [libcxxabi][CMake] Set library dir when built under runtimes/ (authored by Hahnfeld). · Explain WhyMay 3 2017, 11:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
libcxxabi/
trunk/
6 lines

Diff 97777

libcxxabi/trunk/CMakeLists.txt

Show First 20 Lines • Show All 233 Lines • ▼ Show 20 Linesset(CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
${CMAKE_MODULE_PATH} ${CMAKE_MODULE_PATH}
) )
set(LIBCXXABI_COMPILER ${CMAKE_CXX_COMPILER}) set(LIBCXXABI_COMPILER ${CMAKE_CXX_COMPILER})
set(LIBCXXABI_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(LIBCXXABI_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(LIBCXXABI_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(LIBCXXABI_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
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}) set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX})
endif()
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR}) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIBCXXABI_LIBRARY_DIR})
# By default, for non-standalone builds, libcxx and libcxxabi share a library # By default, for non-standalone builds, libcxx and libcxxabi share a library
# directory. # directory.
if (NOT LIBCXXABI_LIBCXX_LIBRARY_PATH) if (NOT LIBCXXABI_LIBCXX_LIBRARY_PATH)
set(LIBCXXABI_LIBCXX_LIBRARY_PATH "${LIBCXXABI_LIBRARY_DIR}" CACHE PATH set(LIBCXXABI_LIBCXX_LIBRARY_PATH "${LIBCXXABI_LIBRARY_DIR}" CACHE PATH
▲ Show 20 Lines • Show All 295 Lines • Show Last 20 Lines