Author: Tom Stellard Date: 2022-11-03T15:12:55-07:00 New Revision: c9a959334707810795f7e8c56ab6dd55ff0a359d
URL: https://github.com/llvm/llvm-project/commit/c9a959334707810795f7e8c56ab6dd55ff0a359d DIFF: https://github.com/llvm/llvm-project/commit/c9a959334707810795f7e8c56ab6dd55ff0a359d.diff LOG: clang/cmake: Simplify lit detection for standalone builds Reviewed By: mgorny, phosek, Ericson2314 Differential Revision: https://reviews.llvm.org/D137224 Added: Modified: clang/CMakeLists.txt Removed: ################################################################################ diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index 236e6fbaca28..8763cc0c1caa 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -93,9 +93,14 @@ if(CLANG_BUILT_STANDALONE) set(LLVM_UTILS_PROVIDED ON) endif() + # Seek installed Lit. + find_program(LLVM_LIT + NAMES llvm-lit lit.py lit + PATHS "${LLVM_MAIN_SRC_DIR}/utils/lit" + DOC "Path to lit.py") + if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py) # Note: path not really used, except for checking if lit was found - set(LLVM_LIT ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py) if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/llvm-lit) add_subdirectory(${LLVM_MAIN_SRC_DIR}/utils/llvm-lit utils/llvm-lit) endif() @@ -112,12 +117,6 @@ if(CLANG_BUILT_STANDALONE) AND EXISTS ${UNITTEST_DIR}/CMakeLists.txt) add_subdirectory(${UNITTEST_DIR} utils/unittest) endif() - else() - # Seek installed Lit. - find_program(LLVM_LIT - NAMES llvm-lit lit.py lit - PATHS "${LLVM_MAIN_SRC_DIR}/utils/lit" - DOC "Path to lit.py") endif() if(LLVM_LIT) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
