diff options
| author | Jordan Rose <jordan_rose@apple.com> | 2013-02-08 07:28:25 +0000 |
|---|---|---|
| committer | Jordan Rose <jordan_rose@apple.com> | 2013-02-08 07:28:25 +0000 |
| commit | 08bf4fd345db86218dea3412b6fdb5463d9248ad (patch) | |
| tree | 9b04738f97995acd99221d854745f33fd5bf0d4d /clang/CMakeLists.txt | |
| parent | b32b0411e6608c0dbe66648ea64873dce1bb369d (diff) | |
| download | llvm-08bf4fd345db86218dea3412b6fdb5463d9248ad.zip llvm-08bf4fd345db86218dea3412b6fdb5463d9248ad.tar.gz llvm-08bf4fd345db86218dea3412b6fdb5463d9248ad.tar.bz2 | |
CMake: Include Clang unit tests in check-clang target in standalone builds.
Also, remove CLANG_BUILD_TESTS option. It won't have consistent behavior
between standalone and non-standalone builds, so I'm not going to bother
hooking it up for standalone builds. LLVM_BUILD_TESTS will continue to
control unit test inclusion in the "all" target in non-standalone builds.
Finally, fix the default value of CLANG_INCLUDE_TESTS, which was being set
to the boolean value of "LLVM_INCLUDE_TESTS", i.e. OFF, rather than actually
reading the variable ${LLVM_INCLUDE_TESTS}! If you picked up my earlier
commit, YOU WILL HAVE TO MANUALLY SET THIS OPTION BACK ON. My apologies!
Part two of r174691 (allow the unit tests to be built in standalone mode).
llvm-svn: 174698
Diffstat (limited to 'clang/CMakeLists.txt')
| -rw-r--r-- | clang/CMakeLists.txt | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index d1c8cec..14fe46f 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -279,17 +279,12 @@ add_subdirectory(examples) # TODO: docs. add_subdirectory(test) -option(CLANG_BUILD_TESTS - "Build Clang unit tests. If OFF, just generate build targets." - LLVM_BUILD_TESTS) option(CLANG_INCLUDE_TESTS "Generate build targets for the Clang unit tests." - LLVM_INCLUDE_TESTS) + ${LLVM_INCLUDE_TESTS}) if( CLANG_INCLUDE_TESTS ) add_subdirectory(unittests) -elseif( CLANG_BUILD_TESTS ) - message(FATAL_ERROR "CLANG_BUILD_TESTS requires CLANG_INCLUDE_TESTS") endif() # Workaround for MSVS10 to avoid the Dialog Hell |