[libcxx] r189739 - [cmake] Provide an option to not install the support headers so that the cmake build can match the make build if requested.

[Michael Gottesman]

Author: mgottesman
Date: Mon Sep  2 02:28:05 2013
New Revision: 189739

URL: http://llvm.org/viewvc/llvm-project?rev=189739&view=rev
Log:
[cmake] Provide an option to not install the support headers so that the cmake build can match the make build if requested.

Modified:
    libcxx/trunk/CMakeLists.txt
    libcxx/trunk/lib/CMakeLists.txt

Modified: libcxx/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=189739&r1=189738&r2=189739&view=diff
==============================================================================
--- libcxx/trunk/CMakeLists.txt (original)
+++ libcxx/trunk/CMakeLists.txt Mon Sep  2 02:28:05 2013
@@ -38,6 +38,7 @@ option(LIBCXX_ENABLE_PEDANTIC "Compile w
 option(LIBCXX_ENABLE_WERROR "Fail and stop if a warning is triggered." OFF)
 option(LIBCXX_ENABLE_CXX0X "Enable -std=c++0x and use of c++0x language features if the compiler supports it." ON)
 option(LIBCXX_ENABLE_SHARED "Build libc++ as a shared library." ON)
+option(LIBCXX_INSTALL_SUPPORT_HEADERS "Install libc++ support headers." ON)
 
 set(CXXABIS none libcxxabi libcxxrt libsupc++)
 if (NOT DEFINED LIBCXX_CXX_ABI)

Modified: libcxx/trunk/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/CMakeLists.txt?rev=189739&r1=189738&r2=189739&view=diff
==============================================================================
--- libcxx/trunk/lib/CMakeLists.txt (original)
+++ libcxx/trunk/lib/CMakeLists.txt Mon Sep  2 02:28:05 2013
@@ -100,9 +100,15 @@ install(TARGETS cxx
   ARCHIVE DESTINATION lib
   )
 
+
+if (NOT LIBCXX_INSTALL_SUPPORT_HEADERS)
+  set(LIBCXX_SUPPORT_HEADER_PATTERN PATTERN "support" EXCLUDE)
+endif()
+
 install(DIRECTORY ../include/
   DESTINATION include/c++/v1
   FILES_MATCHING
   PATTERN "*"
   PATTERN ".svn" EXCLUDE
+  ${LIBCXX_SUPPORT_HEADER_PATTERN}
   )