diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2013-10-28 12:39:56 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2013-10-28 12:39:56 +0000 |
| commit | 265821ba0b9ea2eb77ceb9158ceb83fffe12bc8f (patch) | |
| tree | 24657249764e27d73ab4cad068dc7daee8820bfe /qpid/cpp/docs/api | |
| parent | 45a6f4f415108dd26e00f8902db3f4d5d787b835 (diff) | |
| download | qpid-python-265821ba0b9ea2eb77ceb9158ceb83fffe12bc8f.tar.gz | |
QPID-5260: Significant tidy up of cmake build
* Move to cmake 2.6 as minimum required version
(2.4 is extremely long in the tooth now)
* Add control over building individual language bindings
* Make settings you don't usually want to change advanced
so they are hidden by default
* Changed to a uniform naming scheme for options:
** Options controlling what to build are all BUILD_
** Options controlling features of he build are ENABLE_
** Options controlling internal aspects of the qpid runtime are QPID_
* Respect the BUILD_TESTING option so that we won't build the
tests unless it is set (it is by default)
* If we don't find the boost_unit_test_framework then don't fail,
just don't build the unit tests (this is motivated by one of the
Apache Jenkins ubuntu builders which has this set up)
* Tidied up some of the detection of external dependencies to make it
more idiomatic cmake (but there is more to do here)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1536329 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/docs/api')
| -rw-r--r-- | qpid/cpp/docs/api/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/docs/api/CMakeLists.txt b/qpid/cpp/docs/api/CMakeLists.txt index 828d706b91..79e0d58db5 100644 --- a/qpid/cpp/docs/api/CMakeLists.txt +++ b/qpid/cpp/docs/api/CMakeLists.txt @@ -17,7 +17,7 @@ # under the License. # -if (GEN_DOXYGEN) +if (BUILD_DOCS) # 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. @@ -42,4 +42,4 @@ if (GEN_DOXYGEN) "${QPID_INSTALL_HTMLDIR}/index.html" "Qpid C++ API Documentation" "https://issues.apache.org/jira/browse/QPID" "Report Qpid Problem") endif (CPACK_GENERATOR STREQUAL "NSIS") -endif (GEN_DOXYGEN) +endif (BUILD_DOCS) |