Mercurial > irccd
changeset 37:ed35b9ac33bf
Misc: fix installation directory for Windows installer
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Tue, 23 Feb 2016 13:25:00 +0100 |
| parents | f0e00b72fea9 |
| children | c619a2932730 |
| files | cmake/IrccdPackage.cmake cmake/installer/config/config.xml.in |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/cmake/IrccdPackage.cmake Tue Feb 23 13:07:09 2016 +0100 +++ b/cmake/IrccdPackage.cmake Tue Feb 23 13:25:00 2016 +0100 @@ -28,6 +28,12 @@ if (WIN32) set(PKGSYS "Windows") set(PKGSUFFIX "exe") + + if (IRCCD_64BITS) + set(PKGTARGETDIR "C:/Program Files/irccd-${IRCCD_VERSION}") + else () + set(PKGTARGETDIR "C:/Program Files (x86)/irccd-${IRCCD_VERSION}") + endif () endif () if (IRCCD_64BITS)
--- a/cmake/installer/config/config.xml.in Tue Feb 23 13:07:09 2016 +0100 +++ b/cmake/installer/config/config.xml.in Tue Feb 23 13:25:00 2016 +0100 @@ -5,7 +5,7 @@ <Title>IRC Client Daemon Setup</Title> <Publisher>Malikania Projects</Publisher> <ProductUrl>http://projects.malikania.fr/irccd</ProductUrl> - <StartMenuDir>Irccd</StartMenuDir> + <StartMenuDir>Irccd @IRCCD_VERSION@</StartMenuDir> <AllowNonAsciiCharacters>true</AllowNonAsciiCharacters> - <TargetDir>@CMAKE_INSTALL_PREFIX@</TargetDir> -</Installer> \ No newline at end of file + <TargetDir>@PKGTARGETDIR@</TargetDir> +</Installer>