[llvm-branch-commits] [polly] r308717 - Merging r308512:

Hans Wennborg via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Fri Jul 21 00:53:25 PDT 2017


Author: hans
Date: Fri Jul 21 00:53:25 2017
New Revision: 308717

URL: http://llvm.org/viewvc/llvm-project?rev=308717&view=rev
Log:
Merging r308512:
------------------------------------------------------------------------
r308512 | pfaffe | 2017-07-19 12:20:58 -0700 (Wed, 19 Jul 2017) | 4 lines

[CMake] Fix r307650: Readd missing dependency.

The commit erroneously removed the dependency of the Polly tests on
things like opt and FileCheck. Add that dependency back.
------------------------------------------------------------------------

Modified:
    polly/branches/release_50/   (props changed)
    polly/branches/release_50/test/CMakeLists.txt

Propchange: polly/branches/release_50/
------------------------------------------------------------------------------
    svn:mergeinfo = /polly/trunk:308512

Modified: polly/branches/release_50/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/polly/branches/release_50/test/CMakeLists.txt?rev=308717&r1=308716&r2=308717&view=diff
==============================================================================
--- polly/branches/release_50/test/CMakeLists.txt (original)
+++ polly/branches/release_50/test/CMakeLists.txt Fri Jul 21 00:53:25 2017
@@ -28,14 +28,15 @@ if(NOT LLVM_MAIN_SRC_DIR)
   if ("${POLLY_TEST_EXTRA_PATHS}" STREQUAL "${LLVM_TOOLS_BINARY_DIR}")
     set(POLLY_TEST_EXTRA_PATHS "")
   endif()
+  set(POLLY_TEST_DEPS LLVMPolly)
 else ()
   set(LLVM_OPT "${LLVM_TOOLS_BINARY_DIR}/opt")
   set(LLVM_FILECHECK "${LLVM_TOOLS_BINARY_DIR}/FileCheck")
   set(LLVM_NOT "${LLVM_TOOLS_BINARY_DIR}/not")
   set(POLLY_TEST_EXTRA_PATHS "")
+  set(POLLY_TEST_DEPS llvm-config opt LLVMPolly FileCheck not)
 endif()
 
-set(POLLY_TEST_DEPS LLVMPolly)
 if (POLLY_BUNDLED_ISL)
   list(APPEND POLLY_TEST_DEPS polly-isl-test)
 endif()




More information about the llvm-branch-commits mailing list