You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2010/03/16 17:04:45 UTC
svn commit: r923830 - /qpid/trunk/qpid/cpp/CMakeLists.txt
Author: astitcher
Date: Tue Mar 16 16:04:45 2010
New Revision: 923830
URL: http://svn.apache.org/viewvc?rev=923830&view=rev
Log:
Remove WCF products from the C++ packaging
Modified:
qpid/trunk/qpid/cpp/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeLists.txt?rev=923830&r1=923829&r2=923830&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/CMakeLists.txt Tue Mar 16 16:04:45 2010
@@ -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
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org