[libcxx] r194825 - Justin Bogner: This makes the headers available in the build directory, making it

Howard Hinnant hhinnant at apple.com
Fri Nov 15 09:18:58 PST 2013


Author: hhinnant
Date: Fri Nov 15 11:18:57 2013
New Revision: 194825

URL: http://llvm.org/viewvc/llvm-project?rev=194825&view=rev
Log:
Justin Bogner: This makes the headers available in the build directory, making it
easier to use freshly-built clang with freshly-built libc++.

Basically, this makes it possible to run clang with libc++ without
having to install it, even if you don't have any version of libc++
installed in /usr/

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=194825&r1=194824&r2=194825&view=diff
==============================================================================
--- libcxx/trunk/CMakeLists.txt (original)
+++ libcxx/trunk/CMakeLists.txt Fri Nov 15 11:18:57 2013
@@ -270,6 +270,7 @@ add_definitions(
 #===============================================================================
 
 include_directories(include)
+add_subdirectory(include)
 
 # Add source code. This also contains all of the logic for deciding linker flags
 # soname, etc...

Modified: libcxx/trunk/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/lib/CMakeLists.txt?rev=194825&r1=194824&r2=194825&view=diff
==============================================================================
--- libcxx/trunk/lib/CMakeLists.txt (original)
+++ libcxx/trunk/lib/CMakeLists.txt Fri Nov 15 11:18:57 2013
@@ -99,16 +99,3 @@ install(TARGETS cxx
   LIBRARY DESTINATION lib
   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}
-  )





More information about the cfe-commits mailing list