From 1835d7db42d336a211c72abcab6016e7ef885984 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Mon, 22 Oct 2012 19:27:24 +0000 Subject: 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@1401031 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/BuildInstallSettings.cmake | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'qpid/cpp/BuildInstallSettings.cmake') diff --git a/qpid/cpp/BuildInstallSettings.cmake b/qpid/cpp/BuildInstallSettings.cmake index 4dce28f370..ef76624d4c 100644 --- a/qpid/cpp/BuildInstallSettings.cmake +++ b/qpid/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) -- cgit v1.2.1