diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-10-12 23:52:31 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-10-12 23:52:31 +0000 |
| commit | c334c00f057442d8a0f87d0d64291446b10b5942 (patch) | |
| tree | 6929a933de1a0e023bd210af34f898b02f907e93 /cpp/CMakeLists.txt | |
| parent | c27427b9c259e29f89a392ac5f786ff41f24709b (diff) | |
| download | qpid-python-c334c00f057442d8a0f87d0d64291446b10b5942.tar.gz | |
Add new SocketAddress.cpp and requisite adjustments; a few install improvements
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@824545 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/CMakeLists.txt')
| -rw-r--r-- | cpp/CMakeLists.txt | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 18a7616d99..b15a60ca37 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -101,6 +101,27 @@ if (WIN32) "Directory to load client plug-in modules from") set (QPIDD_MODULE_DIR plugins/broker CACHE STRING "Directory to load broker plug-in modules from") + + # The WCF/C++ client is built separately (it doesn't have a CMakeLists.txt) + # but installed with the C++ components on Windows. + # Don't freak out if it's not there (but it may be good to freak out if + # building the real one...) + install (PROGRAMS + ../wcf/src/Apache/Qpid/Channel/bin/Debug/Apache.Qpid.Channel.dll + ../wcf/src/Apache/Qpid/Channel/bin/Debug/Apache.Qpid.Interop.dll + DESTINATION ${QPID_INSTALL_LIBDIR} + COMPONENT ${QPID_COMPONENT_CLIENT} + OPTIONAL) +# Not sure about this syntax yet... or how to only do it if Client is installed. +# set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS " +# gacutil -I '$INSTDIR\\${QPID_INSTALL_LIBDIR}\\Apache.Qpid.Channel.dll' +# gacutil -I '$INSTDIR\\${QPID_INSTALL_LIBDIR}\\Apache.Qpid.Interop.dll' +# ") +# set (CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " +# gacutil /u 'Apache.Qpid.Channel' +# gacutil /u 'Apache.Qpid.Interop' +# ") + endif (WIN32) if (CMAKE_SYSTEM_NAME STREQUAL Linux) # Set up install locations. Since the Linux install puts some files in |