This is an archive of the discontinued LLVM Phabricator instance.

Differential D32736

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

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

Details

Reviewers
beanz
chandlerc
EricWF
Commits
rG98a7f2798db8: [libcxx][CMake] Set library dir when built under runtimes/
rCXX302117: [libcxx][CMake] Set library dir when built under runtimes/
rL302117: [libcxx][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:29 AM
Herald added a subscriber: mgorny. · View Herald TranscriptMay 2 2017, 12:29 AM
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 rL302117: [libcxx][CMake] Set library dir when built under runtimes/ (authored by Hahnfeld). · Explain WhyMay 3 2017, 11:16 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
libcxx/
trunk/
6 lines

Diff 97776

libcxx/trunk/CMakeLists.txt

Show First 20 Lines • Show All 338 Lines • ▼ Show 20 Lines
#=============================================================================== #===============================================================================
# Configure System # Configure System
#=============================================================================== #===============================================================================
set(LIBCXX_COMPILER ${CMAKE_CXX_COMPILER}) set(LIBCXX_COMPILER ${CMAKE_CXX_COMPILER})
set(LIBCXX_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(LIBCXX_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(LIBCXX_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(LIBCXX_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build") set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build")
if (LLVM_LIBRARY_OUTPUT_INTDIR)
set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
else()
set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX}) set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX})
endif()
file(MAKE_DIRECTORY "${LIBCXX_BINARY_INCLUDE_DIR}") file(MAKE_DIRECTORY "${LIBCXX_BINARY_INCLUDE_DIR}")
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBCXX_LIBRARY_DIR}) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBCXX_LIBRARY_DIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIBCXX_LIBRARY_DIR}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIBCXX_LIBRARY_DIR})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LIBCXX_LIBRARY_DIR}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LIBCXX_LIBRARY_DIR})
# Declare libc++ configuration variables. # Declare libc++ configuration variables.
# They are intended for use as follows: # They are intended for use as follows:
▲ Show 20 Lines • Show All 287 Lines • Show Last 20 Lines