From f054d291f22a0108b24a4fee518aa207b93d5809 Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Fri, 1 Apr 2022 09:29:54 -0700 Subject: [PATCH] Revert "[runtimes] Create Tests.cmake if it does not exist" This reverts commit d6623d72461b5a1ed3bd3ac966d14329e5b0f851 since it broke the build on Mac. --- llvm/runtimes/CMakeLists.txt | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt index f4c486924fb5..9ee124a5616c 100644 --- a/llvm/runtimes/CMakeLists.txt +++ b/llvm/runtimes/CMakeLists.txt @@ -220,11 +220,7 @@ function(runtime_default_target) endforeach() if(LLVM_INCLUDE_TESTS) - if (NOT EXISTS ${LLVM_BINARY_DIR}/runtimes/Tests.cmake) - # This file will be later replaced by the runtimes subbuild. - file(TOUCH ${LLVM_BINARY_DIR}/runtimes/Tests.cmake) - endif() - include(${LLVM_BINARY_DIR}/runtimes/Tests.cmake) + include(${LLVM_BINARY_DIR}/runtimes/Tests.cmake OPTIONAL) set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${LLVM_BINARY_DIR}/runtimes/Tests.cmake) set_property(GLOBAL APPEND PROPERTY LLVM_LIT_TESTSUITES ${SUB_LIT_TESTSUITES}) set_property(GLOBAL APPEND PROPERTY LLVM_LIT_PARAMS ${SUB_LIT_PARAMS}) @@ -306,11 +302,7 @@ function(runtime_register_target name target) endforeach() if(LLVM_INCLUDE_TESTS) - if (NOT EXISTS ${LLVM_BINARY_DIR}/runtimes/Tests.cmake) - # This file will be later replaced by the runtimes subbuild. - file(TOUCH ${LLVM_BINARY_DIR}/runtimes/Tests.cmake) - endif() - include(${LLVM_BINARY_DIR}/runtimes/Tests.cmake) + include(${LLVM_BINARY_DIR}/runtimes/${name}/Tests.cmake OPTIONAL) set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${LLVM_BINARY_DIR}/runtimes/${name}/Tests.cmake) set_property(GLOBAL APPEND PROPERTY LLVM_LIT_TESTSUITES ${SUB_LIT_TESTSUITES}) set_property(GLOBAL APPEND PROPERTY LLVM_LIT_PARAMS ${SUB_LIT_PARAMS})