Author: cbieneman Date: Thu Dec 3 12:52:54 2015 New Revision: 254628 URL: http://llvm.org/viewvc/llvm-project?rev=254628&view=rev Log: [CMake] If you're not installing the libcxx library, exclude it from the "all" target so it doesn't get built when you run "ninja install"
This is just a build dependency optimization. Running check-libcxx will still build libcxx and function as expected, it just removes libcxx from the all build and install targets. Modified: libcxx/trunk/lib/CMakeLists.txt Modified: libcxx/trunk/lib/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/CMakeLists.txt?rev=254628&r1=254627&r2=254628&view=diff ============================================================================== --- libcxx/trunk/lib/CMakeLists.txt (original) +++ libcxx/trunk/lib/CMakeLists.txt Thu Dec 3 12:52:54 2015 @@ -24,10 +24,14 @@ if (MSVC_IDE OR XCODE) endif() endif() +if(NOT LIBCXX_INSTALL_LIBRARY) + set(exclude_from_all EXCLUDE_FROM_ALL) +endif() + if (LIBCXX_ENABLE_SHARED) - add_library(cxx SHARED ${LIBCXX_SOURCES} ${LIBCXX_HEADERS}) + add_library(cxx SHARED ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS}) else() - add_library(cxx STATIC ${LIBCXX_SOURCES} ${LIBCXX_HEADERS}) + add_library(cxx STATIC ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS}) endif() if (DEFINED LIBCXX_CXX_ABI_DEPS) @@ -172,8 +176,11 @@ endif() if (NOT CMAKE_CONFIGURATION_TYPES AND (LIBCXX_INSTALL_LIBRARY OR LIBCXX_INSTALL_HEADERS)) + if(LIBCXX_INSTALL_LIBRARY) + set(deps DEPENDS cxx) + endif() add_custom_target(install-libcxx - DEPENDS cxx + ${deps} COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=libcxx -P "${LIBCXX_BINARY_DIR}/cmake_install.cmake") _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits