Author: shuston
Date: Fri Oct 16 21:24:13 2009
New Revision: 826092
URL: http://svn.apache.org/viewvc?rev=826092&view=rev
Log:
Add API doc generation and install to CMake build.
Added:
qpid/trunk/qpid/cpp/docs/api/CMakeLists.txt (with props)
Modified:
qpid/trunk/qpid/cpp/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeLists.txt?rev=826092&r1=826091&r2=826092&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/CMakeLists.txt Fri Oct 16 21:24:13 2009
@@ -91,6 +91,8 @@
"Directory to install configuration files")
set (QPID_INSTALL_DATADIR conf CACHE STRING
"Directory to install read-only arch.-independent data root")
+ set (QPID_INSTALL_HTMLDIR html CACHE STRING
+ "Directory to install HTML documentation")
set (QPID_INSTALL_INCLUDEDIR include CACHE STRING
"Directory to install programming header files")
set (QPID_INSTALL_LIBDIR bin CACHE STRING
@@ -121,8 +123,8 @@
# gacutil /u 'Apache.Qpid.Channel'
# gacutil /u 'Apache.Qpid.Interop'
# ")
-
endif (WIN32)
+
if (CMAKE_SYSTEM_NAME STREQUAL Linux)
# Set up install locations. Since the Linux install puts some files in
# /etc and most in the install location, we need to use a DESTDIR build
@@ -146,6 +148,8 @@
"Directory to install configuration files")
set (QPID_INSTALL_DATADIR share/qpid CACHE STRING
"Directory to install read-only arch.-independent data root")
+ set (QPID_INSTALL_HTMLDIR html CACHE STRING
+ "Directory to install HTML documentation")
set (QPID_INSTALL_INCLUDEDIR include CACHE STRING
"Directory to install programming header files")
set (QPID_INSTALL_LIBDIR lib CACHE STRING
@@ -177,7 +181,7 @@
add_subdirectory(managementgen)
add_subdirectory(etc)
add_subdirectory(src)
-# add_subdirectory(docs/api)
+add_subdirectory(docs/api)
# add_subdirectory(docs/man)
add_subdirectory(examples)
Added: qpid/trunk/qpid/cpp/docs/api/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/docs/api/CMakeLists.txt?rev=826092&view=auto
==============================================================================
--- qpid/trunk/qpid/cpp/docs/api/CMakeLists.txt (added)
+++ qpid/trunk/qpid/cpp/docs/api/CMakeLists.txt Fri Oct 16 21:24:13 2009
@@ -0,0 +1,36 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+if (GEN_DOXYGEN)
+ # The user.doxygen.in file was originally written for a
+ # configure-generated situation so makes use of configure names that
+ # need to be set from the CMake equivalents.
+ set (top_builddir ${CMAKE_BINARY_DIR})
+ set (top_srcdir ${CMAKE_SOURCE_DIR})
+ set (srcdir ${CMAKE_CURRENT_SOURCE_DIR})
+ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/user.doxygen.in
+ ${CMAKE_CURRENT_BINARY_DIR}/user.doxygen)
+ add_custom_target (user-api-docs COMMAND ${DOXYGEN_EXECUTABLE}
user.doxygen)
+
+ # HTML files are generated to ./html - put those in the install.
+ install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
+ DESTINATION ${QPID_INSTALL_HTMLDIR}
+ COMPONENT ${QPID_COMPONENT_CLIENT_INCLUDE})
+
+endif (GEN_DOXYGEN)
Propchange: qpid/trunk/qpid/cpp/docs/api/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: qpid/trunk/qpid/cpp/docs/api/CMakeLists.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
