From ae86c56d74a4cc549629829714ff189369027a29 Mon Sep 17 00:00:00 2001 From: Steven McCoy Date: Sun, 14 Jul 2013 13:26:55 -0400 Subject: [PATCH] README file moved to GitHub format and extension, drop from packaging and default to NEWS file for popup. --- CMakeLists.txt | 7 +++---- cmake/NSIS.template32.in | 2 +- cmake/NSIS.template64.in | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 04ecac75..5d406bd4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -393,8 +393,7 @@ set(readme-docs AUTHORS COPYING COPYING.LESSER MAINTAINERS - NEWS - README) + NEWS) #----------------------------------------------------------------------------- # optional modules @@ -669,8 +668,8 @@ if(MSVC) set(CPACK_PACKAGE_VENDOR "Miru") set(CPACK_NSIS_CONTACT "Steven McCoy ") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}\\\\COPYING.txt") - set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}\\\\README.txt") - set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_BINARY_DIR}\\\\README.txt") +# set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}\\\\README.txt") +# set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_BINARY_DIR}\\\\WELCOME.txt") # There is a bug in NSI that does not handle full unix paths properly. Make # sure there is at least one set of four(4) backslashes. set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\installer.ico") diff --git a/cmake/NSIS.template32.in b/cmake/NSIS.template32.in index 231a3fd3..bc6ab8d5 100644 --- a/cmake/NSIS.template32.in +++ b/cmake/NSIS.template32.in @@ -556,7 +556,7 @@ FunctionEnd !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER - !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt" + !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NEWS.txt" @CPACK_NSIS_PAGE_COMPONENTS@ diff --git a/cmake/NSIS.template64.in b/cmake/NSIS.template64.in index e744eeca..2deaa4ec 100644 --- a/cmake/NSIS.template64.in +++ b/cmake/NSIS.template64.in @@ -556,7 +556,7 @@ FunctionEnd !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER - !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt" + !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NEWS.txt" @CPACK_NSIS_PAGE_COMPONENTS@