<div class="gmail_quote">Awesome! I'll change it up to implement your suggestions.</div><div class="gmail_quote"><br></div><div class="gmail_quote">On Thu Jul 24 2014 at 11:42:12 AM, Dan Albert <<a href="mailto:danalbert@google.com" target="_blank">danalbert@google.com</a>> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">This has been a change I've been meaning to make for a while. I think a better approach would be to still use 'libcxxabi' for LIBCXX_CXX_ABI, but automatically use the headers in projects/libcxxabi/include in the case of an in-tree build. I might even go as far as saying that libcxxabi is the the default cxx abi for an in-tree build. As it is now, libc++ defaults to cxxabi=none, which means you can't run the tests iirc. As a side note, LIT_EXECUTABLE should also be picked up automatically for an in-tree build.<div>
<br></div><div><a href="https://github.com/llvm-mirror/libcxxabi/blob/master/CMakeLists.txt#L118" target="_blank">https://github.com/llvm-<u></u>mirror/libcxxabi/blob/master/<u></u>CMakeLists.txt#L118</a> shows how I tackled the reverse of this (automatically finding libc++ headers for libc++abi). Essentially, take the first available of the user defined path, the in tree path, or the system headers (the ${CMAKE_BINARY_DIR}/${<u></u>LIBCXXABI_LIBCXX_INCLUDES} bit is to ensure that the user provided path works as an abspath or a relative path).</div>
</div><div class="gmail_extra"><br><br><div class="gmail_quote"></div></div><div class="gmail_extra"><div class="gmail_quote">On Thu, Jul 24, 2014 at 11:09 AM, <span dir="ltr"><<a href="mailto:eatnumber1@google.com" target="_blank">eatnumber1@google.com</a>></span> wrote:<br>
</div></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="gmail_extra"><div class="gmail_quote">From: Russell Harmon <<a href="mailto:eatnumber1@google.com" target="_blank">eatnumber1@google.com</a>><br>
<br>
This adds a new LIBCXX_CXX_ABI called "libcxxabi-in-tree", which will add<br>
"${CMAKE_SOURCE_DIR}/projects/<u></u>libcxxabi/include" to<br>
LIBCXX_LIBCXXABI_INCLUDE_PATHS and will add "cxxabi" as a proper dependency.<br>
---<br>
CMakeLists.txt | 8 +++++++-<br>
1 file changed, 7 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/CMakeLists.txt b/CMakeLists.txt<br>
index c20e5d1..fd3e808 100644<br>
--- a/CMakeLists.txt<br>
+++ b/CMakeLists.txt<br>
@@ -44,7 +44,7 @@ option(LIBCXX_ENABLE_CXX0X "Enable -std=c++0x and use of c++0x language features<br>
option(LIBCXX_ENABLE_SHARED "Build libc++ as a shared library." ON)<br>
option(LIBCXX_INSTALL_<u></u>SUPPORT_HEADERS "Install libc++ support headers." ON)<br>
<br>
-set(CXXABIS none libcxxabi libcxxrt libstdc++ libsupc++)<br>
+set(CXXABIS none libcxxabi libcxxrt libstdc++ libsupc++ libcxxabi-in-tree)<br>
if (NOT DEFINED LIBCXX_CXX_ABI)<br>
set(LIBCXX_CXX_ABI "none")<br>
endif()<br>
@@ -149,6 +149,12 @@ elseif ("${LIBCXX_CXX_ABI}" STREQUAL "libcxxabi")<br>
setup_abi_lib("LIBCXX_<u></u>LIBCXXABI_INCLUDE_PATHS" ""<br>
"c++abi" "cxxabi.h" ""<br>
)<br>
+elseif ("${LIBCXX_CXX_ABI}" STREQUAL "libcxxabi-in-tree")<br>
+ set(LIBCXX_LIBCXXABI_INCLUDE_<u></u>PATHS "${CMAKE_SOURCE_DIR}/projects/<u></u>libcxxabi/include")<br>
+ setup_abi_lib("LIBCXX_<u></u>LIBCXXABI_INCLUDE_PATHS" ""<br>
+ "cxxabi" "cxxabi.h" ""<br>
+ )<br>
+ add_dependencies(LIBCXX_CXX_<u></u>ABI_DEPS cxxabi)<br>
elseif ("${LIBCXX_CXX_ABI}" STREQUAL "libcxxrt")<br>
setup_abi_lib("LIBCXX_<u></u>LIBCXXRT_INCLUDE_PATHS" "-DLIBCXXRT"<br>
"cxxrt" "cxxabi.h;unwind.h;unwind-arm.<u></u>h;unwind-itanium.h" ""<br>
</div></div></blockquote><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="gmail_extra"><div class="gmail_quote"><span><font color="#888888">--<br>
2.0.0.526.g5318336<br>
<br>
______________________________<u></u>_________________<br>
cfe-dev mailing list<br>
<a href="mailto:cfe-dev@cs.uiuc.edu" target="_blank">cfe-dev@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev" target="_blank">http://lists.cs.uiuc.edu/<u></u>mailman/listinfo/cfe-dev</a><br>
</font></span></div></div></blockquote></blockquote></div>