kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject [2/3] incubator-kudu git commit: docs: fix circular dependency
Date Fri, 22 Jan 2016 02:32:47 GMT
docs: fix circular dependency

After commit 3e8d29f, 'make docs' began emitting circular dependency
warnings when invoked:

  Scanning dependencies of target docs
  make[3]: Circular CMakeFiles/docs <- docs dependency dropped.
  make[3]: Circular docs <- docs dependency dropped.

The offending change was the removal of 'build' from DOCS_BUILD_DIRECTORY,
though I don't understand why. In any case, we don't need both a custom
target and command, and removing the latter fixes the circular dependency.

Change-Id: I3b2f2d874926e00b7a838977572b3288bd6156e4
Reviewed-on: http://gerrit.cloudera.org:8080/1856
Tested-by: Internal Jenkins
Reviewed-by: Todd Lipcon <todd@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kudu/commit/efa7e825
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kudu/tree/efa7e825
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kudu/diff/efa7e825

Branch: refs/heads/master
Commit: efa7e825d574f04df85e486e0e2bff553293dc77
Parents: 47d69dd
Author: Adar Dembo <adar@cloudera.com>
Authored: Wed Jan 20 22:51:19 2016 -0800
Committer: Todd Lipcon <todd@apache.org>
Committed: Fri Jan 22 02:32:23 2016 +0000

----------------------------------------------------------------------
 CMakeLists.txt | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kudu/blob/efa7e825/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8e3117..80c0110 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -897,14 +897,10 @@ endif (UNIX)
 # "make docs" target
 ############################################################
 if (UNIX)
-  set(DOCS_BUILD_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docs)
-  add_custom_command(
-    OUTPUT ${DOCS_BUILD_DIRECTORY}
-    # We want the docs output HTML to go in a docs/ subdir of the output dir
-    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/docs/support/scripts/make_docs.sh
-            --build_root ${CMAKE_CURRENT_BINARY_DIR})
   add_custom_target(docs
-    DEPENDS ${DOCS_BUILD_DIRECTORY})
+    # The docs output HTML will end up in a docs/ subdir.
+    ${CMAKE_CURRENT_SOURCE_DIR}/docs/support/scripts/make_docs.sh
+      --build_root ${CMAKE_CURRENT_BINARY_DIR})
 endif (UNIX)
 
 ############################################################


Mime
View raw message