Many thanks for taking this on. I haven’t yet had a chance to look into libcxxabi, but it is next on my list of projects to get into the runtimes subdirectory.
Thanks! -Chris > On Aug 28, 2016, at 11:28 AM, Eric Fiselier via cfe-commits > <cfe-commits@lists.llvm.org> wrote: > > Author: ericwf > Date: Sun Aug 28 13:28:51 2016 > New Revision: 279938 > > URL: http://llvm.org/viewvc/llvm-project?rev=279938&view=rev > Log: > [CMake] Be more consistent about naming targets and components in libc++abi > > This patch (and commit summary) mirror r279675 by Chris B which was applied > to libc++ but not libc++abi. > > Summary: > The point of this patch is to have a consistent convention for naming build, > check and install targets so that the targets can be constructed from the > project name. > > This change renames a bunch of CMake components and targets from libcxxabi to > cxxabi. For each renamed target I've added a convenience target that matches > the old target name and depends on the new target. This will preserve function > of the old targets so that the change doesn't break the world. We can evaluate > if it is worth removing the extra targets later. > > Modified: > libcxxabi/trunk/src/CMakeLists.txt > libcxxabi/trunk/test/CMakeLists.txt > libcxxabi/trunk/www/index.html > > Modified: libcxxabi/trunk/src/CMakeLists.txt > URL: > http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/CMakeLists.txt?rev=279938&r1=279937&r2=279938&view=diff > ============================================================================== > --- libcxxabi/trunk/src/CMakeLists.txt (original) > +++ libcxxabi/trunk/src/CMakeLists.txt Sun Aug 28 13:28:51 2016 > @@ -134,14 +134,17 @@ endif() > add_custom_target(cxxabi DEPENDS ${LIBCXXABI_TARGETS}) > > install(TARGETS ${LIBCXXABI_TARGETS} > - LIBRARY DESTINATION lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT libcxxabi > - ARCHIVE DESTINATION lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT libcxxabi > + LIBRARY DESTINATION lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi > + ARCHIVE DESTINATION lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi > ) > > if (NOT CMAKE_CONFIGURATION_TYPES) > - add_custom_target(install-libcxxabi > + add_custom_target(install-cxxabi > DEPENDS cxxabi > COMMAND "${CMAKE_COMMAND}" > - -DCMAKE_INSTALL_COMPONENT=libcxxabi > + -DCMAKE_INSTALL_COMPONENT=cxxabi > -P "${LIBCXXABI_BINARY_DIR}/cmake_install.cmake") > + > + # TODO: This is a legacy target name and should be removed at some point. > + add_custom_target(install-libcxxabi DEPENDS install-cxxabi) > endif() > > Modified: libcxxabi/trunk/test/CMakeLists.txt > URL: > http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/test/CMakeLists.txt?rev=279938&r1=279937&r2=279938&view=diff > ============================================================================== > --- libcxxabi/trunk/test/CMakeLists.txt (original) > +++ libcxxabi/trunk/test/CMakeLists.txt Sun Aug 28 13:28:51 2016 > @@ -42,7 +42,10 @@ if (NOT LIBCXXABI_STANDALONE_BUILD) > endif() > endif() > > -add_lit_testsuite(check-libcxxabi "Running libcxxabi tests" > +add_lit_testsuite(check-cxxabi "Running libcxxabi tests" > ${CMAKE_CURRENT_BINARY_DIR} > DEPENDS ${LIBCXXABI_TEST_DEPS} > ) > + > +# TODO: This is a legacy target name and should be removed at some point. > +add_custom_target(check-libcxxabi DEPENDS check-cxxabi) > > Modified: libcxxabi/trunk/www/index.html > URL: > http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/www/index.html?rev=279938&r1=279937&r2=279938&view=diff > ============================================================================== > --- libcxxabi/trunk/www/index.html (original) > +++ libcxxabi/trunk/www/index.html Sun Aug 28 13:28:51 2016 > @@ -112,7 +112,7 @@ > > <p>To run the tests:</p> > <ul> > - <li><code>make check-libcxxabi</code></li> > + <li><code>make check-cxxabi</code></li> > </ul> > <p>Note: in a standalone build, the system's libc++ will be used for tests. > If > the system's libc++ was statically linked against libc++abi (or linked > against > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
