This is an archive of the discontinued LLVM Phabricator instance.

Differential D26363

[CMake] Check runtimes subdir when looking for libcxxabi
ClosedPublic

Authored by phosek on Nov 7 2016, 12:11 PM.

Details

Reviewers
EricWF
beanz
Commits
rG260952ed1a9f: [CMake] Check runtimes subdir when looking for libcxxabi
rCXX286333: [CMake] Check runtimes subdir when looking for libcxxabi
rL286333: [CMake] Check runtimes subdir when looking for libcxxabi
Summary

The runtimes subdir is the new location for runtimes, we should
include it when looking for libcxxabi headers.

Diff Detail

Repository
rL LLVM

Event Timeline

phosek updated this revision to Diff 77077.Nov 7 2016, 12:11 PM
phosek retitled this revision from to [CMake] Check runtimes subdir when looking for libcxxabi.
phosek updated this object.
phosek added reviewers: beanz, EricWF.
phosek set the repository for this revision to rL LLVM.
phosek added a subscriber: llvm-commits.
Herald added a subscriber: mgorny. · View Herald TranscriptNov 7 2016, 12:11 PM
beanz accepted this revision.Nov 7 2016, 4:27 PM
beanz edited edge metadata.

LGTM!

This revision is now accepted and ready to land.Nov 7 2016, 4:27 PM
Closed by commit rL286333: [CMake] Check runtimes subdir when looking for libcxxabi (authored by phosek). · Explain WhyNov 8 2016, 7:32 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
libcxx/
trunk/
11 lines

Diff 77304

libcxx/trunk/CMakeLists.txt

Show First 20 Lines • Show All 95 Lines • ▼ Show 20 Lines
# ABI Library options --------------------------------------------------------- # ABI Library options ---------------------------------------------------------
set(LIBCXX_CXX_ABI "${LIBCXX_CXX_ABI}" CACHE STRING set(LIBCXX_CXX_ABI "${LIBCXX_CXX_ABI}" CACHE STRING
"Specify C++ ABI library to use." FORCE) "Specify C++ ABI library to use." FORCE)
set(CXXABIS none libcxxabi libcxxrt libstdc++ libsupc++) set(CXXABIS none libcxxabi libcxxrt libstdc++ libsupc++)
set_property(CACHE LIBCXX_CXX_ABI PROPERTY STRINGS ;${CXXABIS}) set_property(CACHE LIBCXX_CXX_ABI PROPERTY STRINGS ;${CXXABIS})
# Setup the default options if LIBCXX_CXX_ABI is not specified. # Setup the default options if LIBCXX_CXX_ABI is not specified.
if (NOT LIBCXX_CXX_ABI) if (NOT LIBCXX_CXX_ABI)
find_path(
LIBCXX_LIBCXXABI_INCLUDES_INTERNAL
cxxabi.h
PATHS ${LLVM_MAIN_SRC_DIR}/projects/libcxxabi/include
${LLVM_MAIN_SRC_DIR}/runtimes/libcxxabi/include
NO_DEFAULT_PATH
)
if (NOT DEFINED LIBCXX_STANDALONE_BUILD AND if (NOT DEFINED LIBCXX_STANDALONE_BUILD AND
IS_DIRECTORY "${CMAKE_SOURCE_DIR}/projects/libcxxabi") IS_DIRECTORY "${LIBCXX_LIBCXXABI_INCLUDES_INTERNAL}")
set(LIBCXX_CXX_ABI_LIBNAME "libcxxabi") set(LIBCXX_CXX_ABI_LIBNAME "libcxxabi")
set(LIBCXX_CXX_ABI_INCLUDE_PATHS "${CMAKE_SOURCE_DIR}/projects/libcxxabi/include") set(LIBCXX_CXX_ABI_INCLUDE_PATHS "${LIBCXX_LIBCXXABI_INCLUDES_INTERNAL}")
set(LIBCXX_CXX_ABI_INTREE 1) set(LIBCXX_CXX_ABI_INTREE 1)
else() else()
set(LIBCXX_CXX_ABI_LIBNAME "none") set(LIBCXX_CXX_ABI_LIBNAME "none")
endif() endif()
else() else()
set(LIBCXX_CXX_ABI_LIBNAME "${LIBCXX_CXX_ABI}") set(LIBCXX_CXX_ABI_LIBNAME "${LIBCXX_CXX_ABI}")
endif() endif()
▲ Show 20 Lines • Show All 421 Lines • Show Last 20 Lines