[llvm] r188509 - CMake: polish the Windows packaging rules

[Hans Wennborg]

Author: hans
Date: Thu Aug 15 18:44:31 2013
New Revision: 188509

URL: http://llvm.org/viewvc/llvm-project?rev=188509&view=rev
Log:
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

Added:
    llvm/trunk/cmake/nsis_logo.bmp
Modified:
    llvm/trunk/CMakeLists.txt

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=188509&r1=188508&r2=188509&view=diff
==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Thu Aug 15 18:44:31 2013
@@ -493,7 +493,16 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY
 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

Added: llvm/trunk/cmake/nsis_logo.bmp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/nsis_logo.bmp?rev=188509&view=auto
==============================================================================
Binary files llvm/trunk/cmake/nsis_logo.bmp (added) and llvm/trunk/cmake/nsis_logo.bmp Thu Aug 15 18:44:31 2013 differ