This is an archive of the discontinued LLVM Phabricator instance.

Differential D30133

[CMake][libcxxabi] Update the libc++ test module path
ClosedPublic

Authored by phosek on Feb 17 2017, 8:43 PM.

Details

Reviewers
EricWF
beanz
Commits
rG460af4bb9ee5: [CMake][libcxxabi] Update the libc++ test module path
rCXXA295540: [CMake][libcxxabi] Update the libc++ test module path
rL295540: [CMake][libcxxabi] Update the libc++ test module path
Summary

The libcxx/test/libcxx Python package has been moved into libcxx/utils/libcxx in r294651, but libcxxabi's CMakeLists.txt still looks for the old path.

Diff Detail

Repository
rL LLVM

Event Timeline

phosek created this revision.Feb 17 2017, 8:43 PM
Herald edited edge metadata. · View Herald TranscriptFeb 17 2017, 8:43 PM
Herald added a subscriber: mgorny. · View Herald Transcript
EricWF accepted this revision.Feb 17 2017, 8:48 PM
This revision is now accepted and ready to land.Feb 17 2017, 8:48 PM
Closed by commit rL295540: [CMake][libcxxabi] Update the libc++ test module path (authored by phosek). · Explain WhyFeb 17 2017, 8:49 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
libcxxabi/
trunk/
2 lines

Diff 89012

libcxxabi/trunk/CMakeLists.txt

Show First 20 Lines • Show All 184 Lines • ▼ Show 20 Lines PATHS ${LIBCXXABI_LIBCXX_INCLUDES}
${LLVM_INCLUDE_DIR}/c++/v1 ${LLVM_INCLUDE_DIR}/c++/v1
) )
set(LIBCXXABI_LIBCXX_INCLUDES "${LIBCXXABI_LIBCXX_INCLUDES}" CACHE PATH set(LIBCXXABI_LIBCXX_INCLUDES "${LIBCXXABI_LIBCXX_INCLUDES}" CACHE PATH
"Specify path to libc++ includes." FORCE) "Specify path to libc++ includes." FORCE)
find_path( find_path(
LIBCXXABI_LIBCXX_PATH LIBCXXABI_LIBCXX_PATH
test/libcxx/__init__.py utils/libcxx/test/__init__.py
PATHS ${LIBCXXABI_LIBCXX_PATH} PATHS ${LIBCXXABI_LIBCXX_PATH}
${LIBCXXABI_LIBCXX_INCLUDES}/../ ${LIBCXXABI_LIBCXX_INCLUDES}/../
${LIBCXXABI_LIBCXX_SRC_DIRS} ${LIBCXXABI_LIBCXX_SRC_DIRS}
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
if (LIBCXXABI_LIBCXX_PATH STREQUAL "LIBCXXABI_LIBCXX_PATH-NOTFOUND") if (LIBCXXABI_LIBCXX_PATH STREQUAL "LIBCXXABI_LIBCXX_PATH-NOTFOUND")
message(WARNING "LIBCXXABI_LIBCXX_PATH was not specified and couldn't be infered.") message(WARNING "LIBCXXABI_LIBCXX_PATH was not specified and couldn't be infered.")
▲ Show 20 Lines • Show All 308 Lines • Show Last 20 Lines