Author: rhs
Date: Wed Oct 24 18:37:27 2012
New Revision: 1401817
URL: http://svn.apache.org/viewvc?rev=1401817&view=rev
Log:
make docs required for older versions of cmake
Modified:
qpid/proton/trunk/proton-c/CMakeLists.txt
qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt
qpid/proton/trunk/proton-c/docs/api/CMakeLists.txt
Modified: qpid/proton/trunk/proton-c/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/CMakeLists.txt?rev=1401817&r1=1401816&r2=1401817&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/CMakeLists.txt Wed Oct 24 18:37:27 2012
@@ -31,7 +31,13 @@ set (SHARE_INSTALL_DIR share CACHE PATH
set (PROTON_SHARE ${SHARE_INSTALL_DIR}/proton)
-add_custom_target(docs)
+if (${CMAKE_VERSION} VERSION_LESS "2.8.0")
+ set (OPTIONAL_ARG "")
+ add_custom_target(docs ALL)
+else()
+ set (OPTIONAL_ARG OPTIONAL)
+ add_custom_target(docs)
+endif()
# Set the default SSL/TLS implementation
find_package(OpenSSL)
Modified: qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt?rev=1401817&r1=1401816&r2=1401817&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt Wed Oct 24
18:37:27 2012
@@ -29,7 +29,7 @@ if (EPYDOC_EXE)
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html/"
DESTINATION "${PROTON_SHARE}/docs/api-py"
COMPONENT documentation
- OPTIONAL)
+ ${OPTIONAL_ARG})
endif (EPYDOC_EXE)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cproton.py
Modified: qpid/proton/trunk/proton-c/docs/api/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/docs/api/CMakeLists.txt?rev=1401817&r1=1401816&r2=1401817&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/docs/api/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/docs/api/CMakeLists.txt Wed Oct 24 18:37:27 2012
@@ -28,7 +28,8 @@ if (DOXYGEN_FOUND)
install (DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html/"
DESTINATION "${PROTON_SHARE}/docs/api-c"
COMPONENT documentation
- OPTIONAL)
+ ${OPTIONAL_ARG})
+
# if (CPACK_GENERATOR STREQUAL "NSIS")
# set (CPACK_NSIS_MENU_LINKS
# "${QPID_INSTALL_HTMLDIR}/index.html" "Qpid C++ API Documentation"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
