[libcxx-commits] [libcxx] b58902b - [libc++] Fix CMake configuration breakage when libc++ is built neither static nor dynamic

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-03-25T16:50:19-04:00
New Revision: b58902bc72c2b479b5ed27ec0d3422ba9782edbb

URL: https://github.com/llvm/llvm-project/commit/b58902bc72c2b479b5ed27ec0d3422ba9782edbb
DIFF: https://github.com/llvm/llvm-project/commit/b58902bc72c2b479b5ed27ec0d3422ba9782edbb.diff

LOG: [libc++] Fix CMake configuration breakage when libc++ is built neither static nor dynamic

Introduced by https://reviews.llvm.org/D72687. This condition can happen
when the tests are not being run at all, and we're only trying to generate
the libc++ headers.

Added: 
    

Modified: 
    libcxx/test/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libcxx/test/CMakeLists.txt b/libcxx/test/CMakeLists.txt
index aa0f5da2839f..bea82354283e 100644
--- a/libcxx/test/CMakeLists.txt
+++ b/libcxx/test/CMakeLists.txt
@@ -46,11 +46,11 @@ if(DEFINED LIBCXXABI_ENABLE_STATIC
   message(FATAL_ERROR "LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI being OFF requires LIBCXXABI_ENABLE_STATIC to be ON")
 endif()
 
-if(LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXX AND NOT LIBCXX_ENABLE_SHARED)
+if(LIBCXX_INCLUDE_TESTS AND LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXX AND NOT LIBCXX_ENABLE_SHARED)
   message(FATAL_ERROR "LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXX being ON requires LIBCXX_ENABLE_SHARED to be ON")
 endif()
 
-if(NOT LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXX AND NOT LIBCXX_ENABLE_STATIC)
+if(LIBCXX_INCLUDE_TESTS AND NOT LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXX AND NOT LIBCXX_ENABLE_STATIC)
   message(FATAL_ERROR "LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXX being OFF requires LIBCXX_ENABLE_STATIC to be ON")
 endif()