On Thu, Nov 12, 2009 at 4:04 PM, Bill Hoffman <span dir="ltr"><<a href="mailto:bill.hoffman@kitware.com">bill.hoffman@kitware.com</a>></span> wrote:<br><div class="gmail_quote"><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<div class="im">Bill Hoffman wrote:<br>
<br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<br>
# if the user has set CPACK_NSIS_DISPLAY_NAME<br>
# remember<br>
if(DEFINED CPACK_NSIS_DISPLAY_NAME)<br>
SET(CPACK_NSIS_DISPLAY_NAME_SET TRUE)<br>
endif()<br>
cpack_set_if_not_set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")<br>
<br>
# if the user has set CPACK_NSIS_DISPLAY<br>
# explicitly, then use that as the default<br>
# value of CPACK_NSIS_PACKAGE_NAME instead<br>
# of CPACK_PACKAGE_INSTALL_DIRECTORY<br>
if(CPACK_NSIS_DISPLAY_NAME_SET)<br>
cpack_set_if_not_set(CPACK_NSIS_PACKAGE_NAME "${CPACK_NSIS_DISPLAY_NAME}")<br>
else()<br>
cpack_set_if_not_set(CPACK_NSIS_PACKAGE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")<br>
endif()<br>
<br>
<br>
That should keep it working like it did for 2.6 right? It works for your case, no longer crashes.<br>
<br>
</blockquote></div>
I made this commit:<br>
<br>
<br>
RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v<br>
retrieving revision 1.46<br>
diff -r1.46 CPack.cmake<br>
796c796,803<br>
<<br>
---<br>
> # if the user has set CPACK_NSIS_DISPLAY_NAME remember it<div class="im"><br>
> if(DEFINED CPACK_NSIS_DISPLAY_NAME)<br>
> SET(CPACK_NSIS_DISPLAY_NAME_SET TRUE)<br>
> endif()<br></div><div class="im">
> # if the user has set CPACK_NSIS_DISPLAY<br>
> # explicitly, then use that as the default<br>
> # value of CPACK_NSIS_PACKAGE_NAME instead<br>
> # of CPACK_PACKAGE_INSTALL_DIRECTORY<br></div>
798c805,812<div class="im"><br>
< cpack_set_if_not_set(CPACK_NSIS_PACKAGE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")<br></div>
---<div class="im"><br>
><br>
> if(CPACK_NSIS_DISPLAY_NAME_SET)<br></div>
> string(REPLACE "\\" "\\\\"<br>
> _NSIS_DISPLAY_NAME_TMP "${CPACK_NSIS_DISPLAY_NAME}")<br>
> cpack_set_if_not_set(CPACK_NSIS_PACKAGE_NAME "${_NSIS_DISPLAY_NAME_TMP}")<div class="im"><br>
> else()<br>
> cpack_set_if_not_set(CPACK_NSIS_PACKAGE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")<br>
> endif()<br>
<br></div>
hoffman@CORRIN ~/My Builds/CMake/Modules<br>
$ cvs commit -m "Fix regression with CPACK_NSIS_PACKAGE_NAME, if the project is setting the CPACK_NSIS_DISPLAY_NAME then use that as the default value and not the CPACK_PACKAGE_INSTALL_DIRECTORY, also make sure it escapes \ correctly." CPack.cmake<br>
Committer: Bill Hoffman <<a href="mailto:bill.hoffman@kitware.com" target="_blank">bill.hoffman@kitware.com</a>><br>
/cvsroot/CMake/CMake/Modules/CPack.cmake,v <-- CPack.cmake<br>
new revision: 1.47; previous revision: 1.46<br>
<br>
<br>
I am most likely going to push this fix onto 2.8 branch tomorrow if the dashboards look good tonight. If anyone sees and issue with this fix please let me know!<br>
<br>
Thanks.<br><font color="#888888">
<br>
-Bill<br>
</font></blockquote></div><br>Sorry about not checking this earlier. I've been building my code periodically, but I just remembered this morning to test the PACKAGE target.<br><br>It looks good from the code inspection, but I'll have to test it when I get a copy of either the RC or the nightly tomorrow. I don't have Qt compiled on my machine to build CMake-gui.<br>
<br>Thanks again,<br>James<br>