qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r1669618 - in /qpid/dispatch/branches/0.4: CMakeLists.txt doc/CMakeLists.txt site/CMakeLists.txt site/README
Date Fri, 27 Mar 2015 16:49:30 GMT
Author: aconway
Date: Fri Mar 27 16:49:30 2015
New Revision: 1669618

URL: http://svn.apache.org/r1669618
Log:
NO-JIRA: Fix bug in doc generation for in-tree builds.

If cmake was run in the source tree, the doc generator would delete some doc source files.
Fixed this and removed the un-necessary site directory that was causing cmake warnings.

Removed:
    qpid/dispatch/branches/0.4/site/CMakeLists.txt
    qpid/dispatch/branches/0.4/site/README
Modified:
    qpid/dispatch/branches/0.4/CMakeLists.txt
    qpid/dispatch/branches/0.4/doc/CMakeLists.txt

Modified: qpid/dispatch/branches/0.4/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/dispatch/branches/0.4/CMakeLists.txt?rev=1669618&r1=1669617&r2=1669618&view=diff
==============================================================================
--- qpid/dispatch/branches/0.4/CMakeLists.txt (original)
+++ qpid/dispatch/branches/0.4/CMakeLists.txt Fri Mar 27 16:49:30 2015
@@ -143,4 +143,3 @@ add_subdirectory(tests)
 add_subdirectory(python)
 add_subdirectory(router)
 add_subdirectory(doc)
-add_subdirectory(site)

Modified: qpid/dispatch/branches/0.4/doc/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/dispatch/branches/0.4/doc/CMakeLists.txt?rev=1669618&r1=1669617&r2=1669618&view=diff
==============================================================================
--- qpid/dispatch/branches/0.4/doc/CMakeLists.txt (original)
+++ qpid/dispatch/branches/0.4/doc/CMakeLists.txt Fri Mar 27 16:49:30 2015
@@ -65,9 +65,6 @@ if(BUILD_DOCS)
   doc_tool(doxygen USE_DOXYGEN DOXYGEN_FOUND "API documentation")
   doc_tool(dot USE_DOT DOT "diagrams in API documentation (also requires doxygen)")
 
-  file(REMOVE_RECURSE ${bin})     # Force rebuild after re-configuration.
-  file(MAKE_DIRECTORY ${bin}/book ${bin}/man)
-
   # Copy configuration and rst sources to build directory to generate book.
   # Use configure_file to ensure we re-copy if the source changes.
   configure_file(${src}/conf.py.in ${bin}/conf.py)



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message