Skip to content

Commit

Permalink
[cmake] [libcxxabi] Don't print warning when tests are disabled.
Browse files Browse the repository at this point in the history
Summary:
Don't print, possibly erroneous, warning if
LIBCXXABI_INCLUDE_TESTS is false.

This patch fixes a problem introduced in r291367.

Differential Revision: https://reviews.llvm.org/D42229

llvm-svn: 322870
  • Loading branch information
donhinton committed Jan 18, 2018
1 parent 9f49676 commit 964ea50
Showing 1 changed file with 17 additions and 14 deletions.
31 changes: 17 additions & 14 deletions libcxxabi/CMakeLists.txt
Expand Up @@ -440,18 +440,21 @@ endif()
# soname, etc...
add_subdirectory(src)

if (NOT LIBCXXABI_INCLUDE_TESTS OR (LIBCXXABI_STANDALONE_BUILD AND NOT LIBCXXABI_ENABLE_SHARED))
# We can't reasonably test the system C++ library with a static libc++abi.
# We either need to be able to replace libc++abi at run time (with a shared
# libc++abi), or we need to be able to replace the C++ runtime (with a non-
# standalone build).
message(WARNING "The libc++abi tests aren't valid when libc++abi is built "
"standalone (i.e. outside of llvm/projects/libcxxabi ) and "
"is built without a shared library. Either build a shared "
"library, build libc++abi at the same time as you build "
"libc++, or do without testing. No check target will be "
"available!")
else()
add_subdirectory(test)
add_subdirectory(fuzz)
if (LIBCXXABI_INCLUDE_TESTS)
if (LIBCXXABI_STANDALONE_BUILD AND NOT LIBCXXABI_ENABLE_SHARED)
# We can't reasonably test the system C++ library with a static
# libc++abi. We either need to be able to replace libc++abi at
# run time (with a shared libc++abi), or we need to be able to
# replace the C++ runtime (with a non- standalone build).
message(WARNING "The libc++abi tests aren't valid when libc++abi "
"is built standalone (i.e. outside of "
"llvm/projects/libcxxabi ) and is built without "
"a shared library. Either build a shared "
"library, build libc++abi at the same time as "
"you build libc++, or do without testing. No "
"check target will be available!")
else()
add_subdirectory(test)
add_subdirectory(fuzz)
endif()
endif()

0 comments on commit 964ea50

Please sign in to comment.