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/BuildInstallSettings.cmake | |
| 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/BuildInstallSettings.cmake')
| -rw-r--r-- | qpid/cpp/BuildInstallSettings.cmake | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/qpid/cpp/BuildInstallSettings.cmake b/qpid/cpp/BuildInstallSettings.cmake index 6bda220d2b..a8bf3a03c9 100644 --- a/qpid/cpp/BuildInstallSettings.cmake +++ b/qpid/cpp/BuildInstallSettings.cmake @@ -101,6 +101,8 @@ if (WIN32) "Directory to install programming header files") set (QPID_INSTALL_LIBDIR bin CACHE STRING "Directory to install library files") + set (QPID_INSTALL_MANDIR docs CACHE STRING + "Directory to install manual files") set (QPID_INSTALL_SBINDIR bin CACHE STRING "Directory to install system admin executables") set (QPID_INSTALL_TESTDIR bin CACHE STRING @@ -116,9 +118,6 @@ if (WIN32) function(set_absolute_install_path var input) set (${var} ${input} PARENT_SCOPE) endfunction(set_absolute_install_path) - - set (INCLUDE_INSTALL_DIR ${QPID_INSTALL_INCLUDEDIR}) - set (LIB_INSTALL_DIR ${QPID_INSTALL_INCLUDEDIR}) endif (WIN32) if (UNIX) @@ -155,6 +154,7 @@ if (UNIX) set (SYSCONF_INSTALL_DIR etc CACHE PATH "System read only configuration directory") set (SHARE_INSTALL_DIR share CACHE PATH "Shared read only data directory") set (DOC_INSTALL_DIR ${SHARE_INSTALL_DIR}/doc/${CMAKE_PROJECT_NAME}-${QPID_VERSION_FULL} CACHE PATH "Shared read only data directory") + mark_as_advanced(INCLUDE_INSTALL_DIR LIB_INSTALL_DIR SYSCONF_INSTALL_DIR SHARE_INSTALL_DIR DOC_INSTALL_DIR) set (QPID_COMPONENT_BROKER runtime) set (QPID_COMPONENT_CLIENT runtime) @@ -179,8 +179,7 @@ if (UNIX) set (QPID_INSTALL_DOCDIR ${DOC_INSTALL_DIR}) # Directory to install documentation set (QPID_INSTALL_INCLUDEDIR ${INCLUDE_INSTALL_DIR}) set (QPID_INSTALL_LIBDIR ${LIB_INSTALL_DIR}) - set (QPID_LOCALSTATE_DIR var) # Directory to store local state data - set (QPID_MAN_DIR share/man) # Directory to install manual files + set (QPID_INSTALL_MANDIR share/man) # Directory to install manual files set_absolute_install_path (QPIDC_MODULE_DIR ${QPID_INSTALL_LIBDIR}/qpid/client) # Directory to load client plug-in modules from set_absolute_install_path (QPIDD_MODULE_DIR ${QPID_INSTALL_LIBDIR}/qpid/daemon) # Directory to load broker plug-in modules from |