From: Hans Wennborg Date: Thu, 15 Aug 2013 23:44:31 +0000 (+0000) Subject: CMake: polish the Windows packaging rules X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=da44b4f68bcf2adcb74214670a266b43a1a6888f;ds=sidebyside 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 --- 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 00000000000..5fcb3cec198 Binary files /dev/null and b/cmake/nsis_logo.bmp differ