diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2010-03-16 16:04:45 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2010-03-16 16:04:45 +0000 |
| commit | 167df81f50b17a18b481db51a6fa6f240d0e354d (patch) | |
| tree | cb89d46965f6203c94f24e7eb94eba2f1639742d /cpp | |
| parent | 039c418b582d276df99979b09662270edaf8801a (diff) | |
| download | qpid-python-167df81f50b17a18b481db51a6fa6f240d0e354d.tar.gz | |
Remove WCF products from the C++ packaging
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@923830 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/CMakeLists.txt | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 8c4aa06ee2..485ead127a 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -43,37 +43,6 @@ if (WIN32) set (CPACK_NSIS_URL_INFO_ABOUT "http://qpid.apache.org/") # Needs this to correctly set up Start menu links later. set (CPACK_PACKAGE_EXECUTABLES "") - - # The WCF/C++ client is built separately (it doesn't build via CMake) - # but is installed with the C++ components on Windows. - install (PROGRAMS - ${CMAKE_SOURCE_DIR}/../wcf/src/Apache/Qpid/Channel/bin/Release/Apache.Qpid.Channel.dll - ${CMAKE_SOURCE_DIR}/../wcf/src/Apache/Qpid/Channel/bin/Release/Apache.Qpid.Interop.dll - DESTINATION ${QPID_INSTALL_LIBDIR} - COMPONENT ${QPID_COMPONENT_CLIENT}) - install (DIRECTORY ${CMAKE_SOURCE_DIR}/../wcf/samples/Channel - DESTINATION ${QPID_INSTALL_EXAMPLESDIR} - COMPONENT ${QPID_COMPONENT_EXAMPLES} - PATTERN ".svn" EXCLUDE) - - # Find where gacutil is; it's not usually on the default PATH. If it can't - # be located, the WCF assemblies can't be inserted in the GAC. - # The gacutil stuff is disabled for now; to re-enable it, one must be able - # to either find the gacutil somehow and specify the directory where - # gacutil lives, add it to PATH, or use the FUSE API in a program that - # inserts the DLLs programatically without gacutil. Or use WiX, which can - # supposedly do this in an easier way. - # - # See jira QPID-2310 for more info; update that if you change this. - #set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS " - # ExecWait 'gacutil -I \\\"$INSTDIR\\\\${QPID_INSTALL_LIBDIR}\\\\Apache.Qpid.Channel.dll\\\"' - # ExecWait 'gacutil -I \\\"$INSTDIR\\\\${QPID_INSTALL_LIBDIR}\\\\Apache.Qpid.Interop.dll\\\"' - # ") - #set (CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " - # ExecWait 'gacutil /u \\\"Apache.Qpid.Channel\\\"' - # ExecWait 'gacutil /u \\\"Apache.Qpid.Interop\\\"' - # ") - endif (WIN32) set (QPIDC_CONF_FILE ${QPID_INSTALL_CONFDIR}/qpidc.conf CACHE STRING |