From da44b4f68bcf2adcb74214670a266b43a1a6888f Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Thu, 15 Aug 2013 23:44:31 +0000 Subject: [PATCH 1/1] CMake: polish the Windows packaging rules This tweaks the CMake rules for building an installation package on Windows: - Sets license file (otherwise nsis shows an ugly default) - Adds LLVM logo - Shows "do you want to add this to the system path" dialog. Differential Revision: http://llvm-reviews.chandlerc.com/D1414 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188509 91177308-0d34-0410-b5e6-96231b3b80d8 --- CMakeLists.txt | 11 ++++++++++- cmake/nsis_logo.bmp | Bin 0 -> 30776 bytes 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 cmake/nsis_logo.bmp diff --git a/CMakeLists.txt b/CMakeLists.txt index c71f74e67c7..27010d2c532 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -493,7 +493,16 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ set(CPACK_PACKAGE_VENDOR "LLVM") set(CPACK_PACKAGE_VERSION_MAJOR ${LLVM_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${LLVM_VERSION_MINOR}) -add_version_info_from_vcs(CPACK_PACKAGE_VERSION_PATCH) +if( LLVM_APPEND_VC_REV ) + add_version_info_from_vcs(CPACK_PACKAGE_VERSION_PATCH) +else() + set(CPACK_PACKAGE_VERSION_PATCH "svn") +endif() +set(CPACK_RESOURCE_FILE_LICENSE "${LLVM_MAIN_SRC_DIR}/LICENSE.TXT") +if(WIN32 AND NOT UNIX) + set(CPACK_PACKAGE_ICON "${LLVM_MAIN_SRC_DIR}\\\\cmake\\\\nsis_logo.bmp") + set(CPACK_NSIS_MODIFY_PATH "ON") +endif() include(CPack) # Workaround for MSVS10 to avoid the Dialog Hell diff --git a/cmake/nsis_logo.bmp b/cmake/nsis_logo.bmp new file mode 100644 index 0000000000000000000000000000000000000000..5fcb3cec19858386f3bfbd318b2b46b4de9101ca GIT binary patch literal 30776 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