diff options
author | Alon Zakai <alonzakai@gmail.com> | 2014-04-16 11:06:30 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2014-04-16 11:06:30 -0700 |
commit | 9596f4e867095c9f1741601615a8d2bcb097772e (patch) | |
tree | a0c9f7f077ee8226c38fd9540c61bd4738d41a3b /CMakeLists.txt | |
parent | 51c484d755eec70ebb2c4592cef61131e00bcb44 (diff) | |
parent | 926efa5d923dfd9555270a2bbb156bc30ce35fc9 (diff) |
Merge branch 'incoming'1.16.0
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d05a4cdb5..bcd5c52578 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -290,10 +290,10 @@ option(CLANG_INCLUDE_TESTS "Generate build targets for the Clang unit tests." ${LLVM_INCLUDE_TESTS}) -# TODO: docs. -add_subdirectory(test) - if( CLANG_INCLUDE_TESTS ) + # TODO: docs. + add_subdirectory(test) # XXX Emscripten: Backport fix from upstream LLVM 3.4 to actually skip tests if CLANG_INCLUDE_TESTS = OFF + add_subdirectory(unittests) endif() |