From 59f6d293359c431939b28219a148cd0ad75f0d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Wed, 17 Oct 2012 10:46:40 -0400 Subject: [PATCH] cmake: get initial windows cpack generators to work --- .gitignore | 2 ++ CMakeLists.txt | 10 +++++++--- resources/FreeRDP_Icon_96px.ico | Bin 0 -> 38078 bytes resources/FreeRDP_Install.bmp | Bin 0 -> 25818 bytes 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 resources/FreeRDP_Icon_96px.ico create mode 100644 resources/FreeRDP_Install.bmp diff --git a/.gitignore b/.gitignore index 5e1b3a147..a6b7efe65 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,8 @@ DartConfiguration.tcl _CPack_Packages # Packages +*.zip +*.exe *.sh *.tar.Z *.tar.gz diff --git a/CMakeLists.txt b/CMakeLists.txt index 2eed08453..b801c938f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -307,8 +307,12 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${FREERDP_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${FREERDP_VERSION_MINOR}) set(CPACK_PACKAGE_VERSION_PATCH ${FREERDP_VERSION_REVISION}) -set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") +set(CPACK_PACKAGE_INSTALL_DIRECTORY "FreeRDP") +set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/LICENSE") +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") + +set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/resources\\\\FreeRDP_Install.bmp") +set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/resources\\\\FreeRDP_Icon_96px.ico") +set(CPACK_NSIS_MUI_UNICON "${CMAKE_SOURCE_DIR}/resource\\\\FreeRDP_Icon_96px.ico") include(CPack) - diff --git a/resources/FreeRDP_Icon_96px.ico b/resources/FreeRDP_Icon_96px.ico new file mode 100644 index 0000000000000000000000000000000000000000..21e095fe9795148f88cdf4e45acbc23706072eef GIT binary patch literal 38078 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 AJ^%m! literal 0 HcmV?d00001