From 6673c42f68ae85401859abd6138ee7af13564186 Mon Sep 17 00:00:00 2001 From: Russel Waters Date: Fri, 9 Mar 2018 00:39:53 -0500 Subject: [PATCH] Update .gitignore, Install to C:\Program Files\Nano-*.*.* from installer Nano-*.*.* (#716) --- .gitignore | 1 + CMakeLists.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 6f28d200..e1ee4b6f 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ slow_test # Visual Studio *.vcxproj *.vcxproj.filters +*.vcxproj.user *.sln *.qrc.depends *.dir diff --git a/CMakeLists.txt b/CMakeLists.txt index 27d83ec4..50dba0d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -479,6 +479,7 @@ if (RAIBLOCKS_GUI) set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\${WIN_REDIST}\\\" /quiet /norestart'") set (CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/RaiBlocks.ico) set (CPACK_NSIS_DISPLAY_NAME "Nano") + set (CPACK_PACKAGE_NAME "Nano_Installer") set (CPACK_NSIS_PACKAGE_NAME "Nano ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") set (CPACK_NSIS_URL_INFO_ABOUT "https://nano.org") set (CPACK_NSIS_CONTACT "clemahieu@raiblocks.net")