diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2012-10-22 19:27:24 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2012-10-22 19:27:24 +0000 |
| commit | b385c0538cd3340cac4284ea6ffa129a73f51f5d (patch) | |
| tree | eb1355c5bf37e9ace68495c6d4f94ceb4ac21ea8 /cpp | |
| parent | b97f6206e2dada6a353f0582b0f8445293666b9f (diff) | |
| download | qpid-python-b385c0538cd3340cac4284ea6ffa129a73f51f5d.tar.gz | |
QPID-3633: Make cmake the primary build tool for the cpp tree
- Add some cmake things missed from the windows port
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1401031 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/BuildInstallSettings.cmake | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/cpp/BuildInstallSettings.cmake b/cpp/BuildInstallSettings.cmake index 4dce28f370..ef76624d4c 100644 --- a/cpp/BuildInstallSettings.cmake +++ b/cpp/BuildInstallSettings.cmake @@ -102,10 +102,22 @@ if (WIN32) "Directory to install library files") set (QPID_INSTALL_SBINDIR bin CACHE STRING "Directory to install system admin executables") + set (QPID_INSTALL_TESTDIR bin CACHE STRING + "Directory for test executables") set (QPIDC_MODULE_DIR plugins/client CACHE STRING "Directory to load client plug-in modules from") set (QPIDD_MODULE_DIR plugins/broker CACHE STRING "Directory to load broker plug-in modules from") + +# function to get absolute path from a variable that may be relative to the +# install prefix - For Windows we can never know the absolute install prefix +# as this is decided at install time so this just returns the input path + 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) |