diff options
| -rw-r--r-- | cpp/CMakeLists.txt | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 272d007c4a..8c4aa06ee2 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -56,14 +56,23 @@ if (WIN32) COMPONENT ${QPID_COMPONENT_EXAMPLES} PATTERN ".svn" EXCLUDE) -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\\\"' - ") + # 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) |