This is an archive of the discontinued LLVM Phabricator instance.

[CMake] Use MATCHES for regular expression comparison.
ClosedPublic

Authored by aoli on Jul 17 2017, 3:46 PM.

Download Raw Diff

Details

Reviewers

Commits

rG95e45f9f93d1: [CMake] Use MATCHES for regular expression.
rCXX308347: [CMake] Use MATCHES for regular expression.
rL308347: [CMake] Use MATCHES for regular expression.

Diff Detail

Repository: rL LLVM

Event Timeline

aoli created this revision.Jul 17 2017, 3:46 PM

Herald added a subscriber: mgorny. · View Herald TranscriptJul 17 2017, 3:46 PM

aoli retitled this revision from [CMake] Use MATCHES for regular expression. to [CMake] Use MATCHES for regular expression comparison..Jul 17 2017, 3:50 PM

aoli added a reviewer: phosek.

aoli set the repository for this revision to rL LLVM.

aoli added subscribers: cfe-commits, pirama, srhines.

LGTM

This revision is now accepted and ready to land.Jul 18 2017, 11:21 AM

Closed by commit rL308347: [CMake] Use MATCHES for regular expression. (authored by aoli). · Explain WhyJul 18 2017, 12:48 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

libcxx/

trunk/

lib/

CMakeLists.txt

2 lines

Diff 107160

libcxx/trunk/lib/CMakeLists.txt

Show First 20 Lines • Show All 252 Lines • ▼ Show 20 Lines	if (LIBCXX_ENABLE_STATIC)
list(APPEND LIBCXX_TARGETS "cxx_static")		list(APPEND LIBCXX_TARGETS "cxx_static")
# Attempt to merge the libc++.a archive and the ABI library archive into one.		# Attempt to merge the libc++.a archive and the ABI library archive into one.
if (LIBCXX_ENABLE_STATIC_ABI_LIBRARY)		if (LIBCXX_ENABLE_STATIC_ABI_LIBRARY)
set(MERGE_ARCHIVES_SEARCH_PATHS "")		set(MERGE_ARCHIVES_SEARCH_PATHS "")
if (LIBCXX_CXX_ABI_LIBRARY_PATH)		if (LIBCXX_CXX_ABI_LIBRARY_PATH)
set(MERGE_ARCHIVES_SEARCH_PATHS "-L${LIBCXX_CXX_ABI_LIBRARY_PATH}")		set(MERGE_ARCHIVES_SEARCH_PATHS "-L${LIBCXX_CXX_ABI_LIBRARY_PATH}")
endif()		endif()
if ((TARGET ${LIBCXX_CXX_ABI_LIBRARY}) OR		if ((TARGET ${LIBCXX_CXX_ABI_LIBRARY}) OR
(${LIBCXX_CXX_ABI_LIBRARY} STREQUAL "cxxabi(_static\|_shared)?" AND HAVE_LIBCXXABI))		(${LIBCXX_CXX_ABI_LIBRARY} MATCHES "cxxabi(_static\|_shared)?" AND HAVE_LIBCXXABI))
set(MERGE_ARCHIVES_ABI_TARGET "$<TARGET_LINKER_FILE:${LIBCXX_CXX_ABI_LIBRARY}>")		set(MERGE_ARCHIVES_ABI_TARGET "$<TARGET_LINKER_FILE:${LIBCXX_CXX_ABI_LIBRARY}>")
else()		else()
set(MERGE_ARCHIVES_ABI_TARGET		set(MERGE_ARCHIVES_ABI_TARGET
"${CMAKE_STATIC_LIBRARY_PREFIX}${LIBCXX_CXX_ABI_LIBRARY}${CMAKE_STATIC_LIBRARY_SUFFIX}")		"${CMAKE_STATIC_LIBRARY_PREFIX}${LIBCXX_CXX_ABI_LIBRARY}${CMAKE_STATIC_LIBRARY_SUFFIX}")
endif()		endif()
add_custom_command(TARGET cxx_static POST_BUILD		add_custom_command(TARGET cxx_static POST_BUILD
COMMAND		COMMAND
${PYTHON_EXECUTABLE} ${LIBCXX_SOURCE_DIR}/utils/merge_archives.py		${PYTHON_EXECUTABLE} ${LIBCXX_SOURCE_DIR}/utils/merge_archives.py
▲ Show 20 Lines • Show All 122 Lines • Show Last 20 Lines