summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2012-10-22 06:57:03 +0000
committerAndrew Stitcher <astitcher@apache.org>2012-10-22 06:57:03 +0000
commitd2c1ce9818a6584a53b5606a271d96ce0937baf3 (patch)
tree6604fa43fe4699601aca497e04d7775187fc9e42
parent890a4e6abbd2d0f49b3b89d36701bfdadc8cd4fb (diff)
downloadqpid-python-d2c1ce9818a6584a53b5606a271d96ce0937baf3.tar.gz
QPID-3633: Make cmake the primary build tool for the cpp tree
Always build doxygen docs if we have doxygen, this ensures it's available at install time. - This is not ideal as it builds even if unecessary and can take some time. However cmake presently has no way make this an install dependency. If not required set the cmake GEN_DOXYGEN variable to false to turn tese docs off. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1400782 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--cpp/docs/api/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/docs/api/CMakeLists.txt b/cpp/docs/api/CMakeLists.txt
index 27a84ab443..1c2e72394c 100644
--- a/cpp/docs/api/CMakeLists.txt
+++ b/cpp/docs/api/CMakeLists.txt
@@ -28,8 +28,8 @@ if (GEN_DOXYGEN)
${CMAKE_CURRENT_BINARY_DIR}/user.doxygen)
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/developer.doxygen.in
${CMAKE_CURRENT_BINARY_DIR}/developer.doxygen)
- add_custom_target (docs-user-api COMMAND ${DOXYGEN_EXECUTABLE} user.doxygen)
- add_custom_target (docs-developer COMMAND ${DOXYGEN_EXECUTABLE} developer.doxygen)
+ add_custom_target (docs-user-api ALL COMMAND ${DOXYGEN_EXECUTABLE} user.doxygen)
+ add_custom_target (docs-developer ALL COMMAND ${DOXYGEN_EXECUTABLE} developer.doxygen)
# HTML files are generated to ./html - put those in the install.
install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/