[PATCH] [libcxx] Unify LIBCXX_<ABI-Name>_INCLUDE_PATHS to be LIBCXX_ABI_INCLUDE_PATHS

[Eric Fiselier]

Hi mclow.lists, danalbert,

Clean up all the different possible CMake options for specifying the ABI include paths into one CMake option named `LIBCXX_ABI_INCLUDE_PATHS`. 
The documentation has been updated to reflect this change. This depends D5038.

Should we do anything special to announce this change?

http://reviews.llvm.org/D5039

Files:
  CMakeLists.txt
  cmake/HandleLibCXXABI.cmake
  www/index.html

Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -53,7 +53,7 @@
   if (NOT DEFINED LIBCXX_BUILT_STANDALONE AND
       IS_DIRECTORY "${CMAKE_SOURCE_DIR}/projects/libcxxabi")
     set(LIBCXX_CXX_ABI_LIBNAME "libcxxabi")
-    set(LIBCXX_LIBCXXABI_INCLUDE_PATHS "${CMAKE_SOURCE_DIR}/projects/libcxxabi/include")
+    set(LIBCXX_ABI_INCLUDE_PATHS "${CMAKE_SOURCE_DIR}/projects/libcxxabi/include")
     set(LIBCXX_CXX_ABI_INTREE 1)
   else ()
     set(LIBCXX_CXX_ABI_LIBNAME "none")
Index: cmake/HandleLibCXXABI.cmake
===================================================================
--- cmake/HandleLibCXXABI.cmake
+++ cmake/HandleLibCXXABI.cmake
@@ -82,7 +82,7 @@
     set(_LIBSUPCXX_DEFINES "")
     set(_LIBSUPCXX_LIBNAME supc++)
   endif()
-  setup_abi_lib("LIBCXX_LIBSUPCXX_INCLUDE_PATHS"
+  setup_abi_lib("LIBCXX_ABI_INCLUDE_PATHS"
     "-D__GLIBCXX__ ${_LIBSUPCXX_DEFINES}"
     "${_LIBSUPCXX_LIBNAME}" "${_LIBSUPCXX_INCLUDE_FILES}" "bits"
     )
@@ -94,11 +94,11 @@
     # Assume c++abi is installed in the system, rely on -lc++abi link flag.
     set(CXXABI_LIBNAME "c++abi")
   endif()
-  setup_abi_lib("LIBCXX_LIBCXXABI_INCLUDE_PATHS" ""
+  setup_abi_lib("LIBCXX_ABI_INCLUDE_PATHS" ""
     ${CXXABI_LIBNAME} "cxxabi.h" ""
     )
 elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxrt")
-  setup_abi_lib("LIBCXX_LIBCXXRT_INCLUDE_PATHS" "-DLIBCXXRT"
+  setup_abi_lib("LIBCXX_ABI_INCLUDE_PATHS" "-DLIBCXXRT"
     "cxxrt" "cxxabi.h;unwind.h;unwind-arm.h;unwind-itanium.h" ""
     )
 elseif (NOT "${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "none")
Index: www/index.html
===================================================================
--- www/index.html
+++ www/index.html
@@ -205,7 +205,7 @@
     <li><code>cd libcxx</code></li>
     <li><code>mkdir build && cd build</code></li>
     <li><code>cmake -DLIBCXX_CXX_ABI=libcxxabi
-        -DLIBCXX_LIBCXXABI_INCLUDE_PATHS=path/to/libcxxabi/include
+        -DLIBCXX_ABI_INCLUDE_PATHS=path/to/libcxxabi/include
         -DLIT_EXECUTABLE=path/to/llvm/utils/lit/lit.py .. # Linux may require
         -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++</code></li>
     <li><code>make</code></li>
@@ -376,7 +376,7 @@
      <ul>
        <li><code>CC=clang CXX=clang++ cmake -G "Unix Makefiles"
                 -DLIBCXX_CXX_ABI=libstdc++
-                -DLIBCXX_LIBSUPCXX_INCLUDE_PATHS="/usr/include/c++/4.7/;/usr/include/c++/4.7/x86_64-linux-gnu/"
+                -DLIBCXX_ABI_INCLUDE_PATHS="/usr/include/c++/4.7/;/usr/include/c++/4.7/x86_64-linux-gnu/"
                 -DCMAKE_BUILD_TYPE=Release
                 -DCMAKE_INSTALL_PREFIX=/usr
                 <libc++-source-dir></code></li>
@@ -411,7 +411,7 @@
      <ul>
        <li><code>CC=clang CXX=clang++ cmake -G "Unix Makefiles"
                 -DLIBCXX_CXX_ABI=libcxxrt
-                -DLIBCXX_LIBCXXRT_INCLUDE_PATHS="<libcxxrt-source-dir>/src"
+                -DLIBCXX_ABI_INCLUDE_PATHS="<libcxxrt-source-dir>/src"
                 -DCMAKE_BUILD_TYPE=Release
                 -DCMAKE_INSTALL_PREFIX=/usr
                 <libc++-source-dir></code></li>
@@ -455,7 +455,7 @@
         <ul>
         <li><code>CC=clang CXX=clang++ cmake -G "Unix Makefiles"
                  -DLIBCXX_CXX_ABI=libc++abi
-                 -DLIBCXX_LIBCXXABI_INCLUDE_PATHS="/path/to/libcxxabi/include"
+                 -DLIBCXX_ABI_INCLUDE_PATHS="/path/to/libcxxabi/include"
                  -DCMAKE_LIBRARY_PATH="/path/to/libcxxabi-build/lib"
                  <libc++-source-dir></code></li>
         <li><code>export RPATH=/path/to/libcxxabi-build/lib</code></li>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D5039.12878.patch
Type: text/x-patch
Size: 3681 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20140823/2adf8f1b/attachment.bin>