CMake: polish the Windows packaging rules
authorHans Wennborg <hans@hanshq.net>
Thu, 15 Aug 2013 23:44:31 +0000 (23:44 +0000)
committerHans Wennborg <hans@hanshq.net>
Thu, 15 Aug 2013 23:44:31 +0000 (23:44 +0000)
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

llvm-svn: 188509

llvm/CMakeLists.txt
llvm/cmake/nsis_logo.bmp [new file with mode: 0644]

index c71f74e67c7e103632ae0793c32898078b852c37..27010d2c5321c4261423ba9e39642e89f5710f8c 100644 (file)
@@ -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/llvm/cmake/nsis_logo.bmp b/llvm/cmake/nsis_logo.bmp
new file mode 100644 (file)
index 0000000..5fcb3ce
Binary files /dev/null and b/llvm/cmake/nsis_logo.bmp differ