JDevlieghere created this revision.
JDevlieghere added reviewers: teemperor, labath.
Herald added a subscriber: mgorny.
JDevlieghere requested review of this revision.
Now that passing `libcxx` via `LLVM_ENABLE_PROJECTS` has been deprecated,
update the error message and recommend using `LLVM_ENABLE_RUNTIMES` instead.
This patch also remove the error message for the old layout.
https://reviews.llvm.org/D112856
Files:
lldb/test/CMakeLists.txt
Index: lldb/test/CMakeLists.txt
===================================================================
--- lldb/test/CMakeLists.txt
+++ lldb/test/CMakeLists.txt
@@ -117,23 +117,12 @@
endif()
else()
# We require libcxx for the test suite, so if we aren't building it,
- # try to provide a helpful error about how to resolve the situation.
+ # provide a helpful error about how to resolve the situation.
if(NOT TARGET cxx AND NOT libcxx IN_LIST LLVM_ENABLE_RUNTIMES)
- if(LLVM_ENABLE_PROJECTS STREQUAL "")
- # If `LLVM_ENABLE_PROJECTS` is not being used (implying that we are
- # using the old layout), suggest checking it out.
- message(FATAL_ERROR
- "LLDB test suite requires libc++, but it is currently disabled. "
- "Please checkout `libcxx` in `llvm/projects` or disable tests "
- "via `LLDB_INCLUDE_TESTS=OFF`.")
- else()
- # If `LLVM_ENABLE_PROJECTS` is being used, suggest adding it.
- message(FATAL_ERROR
- "LLDB test suite requires libc++, but it is currently disabled. "
- "Please add `libcxx` to `LLVM_ENABLE_PROJECTS` or "
- "`LLVM_ENABLE_RUNTIMES`, or disable tests via "
- "`LLDB_INCLUDE_TESTS=OFF`.")
- endif()
+ message(FATAL_ERROR
+ "LLDB test suite requires libc++, but it is currently disabled. "
+ "Please add `libcxx` to `LLVM_ENABLE_RUNTIMES` or disable tests via "
+ "`LLDB_INCLUDE_TESTS=OFF`.")
endif()
endif()
endif()
Index: lldb/test/CMakeLists.txt
===================================================================
--- lldb/test/CMakeLists.txt
+++ lldb/test/CMakeLists.txt
@@ -117,23 +117,12 @@
endif()
else()
# We require libcxx for the test suite, so if we aren't building it,
- # try to provide a helpful error about how to resolve the situation.
+ # provide a helpful error about how to resolve the situation.
if(NOT TARGET cxx AND NOT libcxx IN_LIST LLVM_ENABLE_RUNTIMES)
- if(LLVM_ENABLE_PROJECTS STREQUAL "")
- # If `LLVM_ENABLE_PROJECTS` is not being used (implying that we are
- # using the old layout), suggest checking it out.
- message(FATAL_ERROR
- "LLDB test suite requires libc++, but it is currently disabled. "
- "Please checkout `libcxx` in `llvm/projects` or disable tests "
- "via `LLDB_INCLUDE_TESTS=OFF`.")
- else()
- # If `LLVM_ENABLE_PROJECTS` is being used, suggest adding it.
- message(FATAL_ERROR
- "LLDB test suite requires libc++, but it is currently disabled. "
- "Please add `libcxx` to `LLVM_ENABLE_PROJECTS` or "
- "`LLVM_ENABLE_RUNTIMES`, or disable tests via "
- "`LLDB_INCLUDE_TESTS=OFF`.")
- endif()
+ message(FATAL_ERROR
+ "LLDB test suite requires libc++, but it is currently disabled. "
+ "Please add `libcxx` to `LLVM_ENABLE_RUNTIMES` or disable tests via "
+ "`LLDB_INCLUDE_TESTS=OFF`.")
endif()
endif()
endif()
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
