diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2009-05-14 15:19:56 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2009-05-14 15:19:56 +0000 |
| commit | a05dff2847b981cda1f584398f46cbc790afec4f (patch) | |
| tree | e0ef23ecc71ea5cd19f8201e549b3efbe1834aca /qpid/cpp/src/CMakeLists.txt | |
| parent | 70c71154f9daa923734c473cc6966cdcbb01408f (diff) | |
| download | qpid-python-a05dff2847b981cda1f584398f46cbc790afec4f.tar.gz | |
More work on cmake:
Make tests build on Linux
Fix XML tests to run
Fix cmake installed locations for modules/config files
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@774814 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/CMakeLists.txt')
| -rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index cc2b020bd1..a4affcf010 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -118,13 +118,17 @@ if (ENABLE_VALGRIND AND NOT VALGRIND) message(STATUS "Can't locate the valgrind command; no run-time error detection") endif (ENABLE_VALGRIND AND NOT VALGRIND) -set(QPIDC_MODULE_DIR "." CACHE STRING +set(QPIDC_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib CACHE STRING + "Directory to install library files") +set(QPIDC_INSTALL_CONFDIR ${CMAKE_INSTALL_PREFIX}/etc CACHE STRING + "Directory to install configuration files") +set(QPIDC_MODULE_DIR ${QPIDC_INSTALL_LIBDIR}/qpid/client CACHE STRING "Directory to load client plug-in modules from") -set(QPIDD_MODULE_DIR "." CACHE STRING +set(QPIDD_MODULE_DIR ${QPIDC_INSTALL_LIBDIR}/qpid/daemon CACHE STRING "Directory to load broker plug-in modules from") -set(QPIDC_CONF_FILE "qpidc.conf" CACHE STRING +set(QPIDC_CONF_FILE ${QPIDC_INSTALL_CONFDIR}/qpid/qpidc.conf CACHE STRING "Name of the Qpid client configuration file") -set(QPIDD_CONF_FILE "qpidd.conf" CACHE STRING +set(QPIDD_CONF_FILE ${QPIDC_INSTALL_CONFDIR}/qpid/qpidd.conf CACHE STRING "Name of the Qpid broker configuration file") option(ENABLE_WARNINGS "Enable lots of compiler warnings (recommended)" ON) @@ -227,6 +231,9 @@ if (BUILD_XML) PREFIX "" LINK_FLAGS -Wl,--no-undefined) endif (CMAKE_COMPILER_IS_GNUCXX) + + set(xml_tests XmlClientSessionTest) + endif (BUILD_XML) # Build the ACL plugin |