move WITH_POLLY option before add_subdirectory(tools)
authorSebastian Pop <spop@codeaurora.org>
Tue, 11 Mar 2014 22:42:07 +0000 (22:42 +0000)
committerSebastian Pop <spop@codeaurora.org>
Tue, 11 Mar 2014 22:42:07 +0000 (22:42 +0000)
the first run of the polly buildbot failed, and then it started passing.
This is due to the fact that the buildbot re-builds in an existing directory,
and the first run does not have WITH_POLLY set when it enters tools/.
Thus, cmake ignores the tools/polly dir in the first run, and then because
it reuses the CMakeCache.txt of the previous run, it has the WITH_POLLY set
by the previous run, and so it passes the second time.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@203615 91177308-0d34-0410-b5e6-96231b3b80d8

CMakeLists.txt

index 2e758f3fb70b1c6ae3eee03f56b0c068b6fba9ba..49d1296950a5b3120b77985966ec5d9a788f3032 100644 (file)
@@ -502,6 +502,13 @@ endif()
 
 add_subdirectory(projects)
 
+option(WITH_POLLY "Build LLVM with Polly" ON)
+if(WITH_POLLY)
+  if(NOT EXISTS ${LLVM_MAIN_SRC_DIR}/tools/polly/CMakeLists.txt)
+    set(WITH_POLLY OFF)
+  endif()
+endif(WITH_POLLY)
+
 if( LLVM_INCLUDE_TOOLS )
   add_subdirectory(tools)
 endif()
@@ -564,10 +571,3 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
     PATTERN ".svn" EXCLUDE
     )
 endif()
-
-option(WITH_POLLY "Build LLVM with Polly" ON)
-if(WITH_POLLY)
-  if(NOT EXISTS ${LLVM_MAIN_SRC_DIR}/tools/polly/CMakeLists.txt)
-    set(WITH_POLLY OFF)
-  endif()
-endif(WITH_POLLY)