Make sure NSIS installer works.

packaging/CMakeLists.txt

@@ -5,16 +5,16 @@ if (CMAKE_SIZEOF_VOID_P EQUAL 8)
 	set(WINDOWS_SUFFIX "win64")
 endif()
 configure_file("nsis/distribution.in.txt" "nsis/distribution.txt" ESCAPE_QUOTES @ONLY NEWLINE_STYLE DOS)
-configure_file("nsis/gsmartcontrol.in.nsi" "nsis/gsmartcontrol.nsi" ESCAPE_QUOTES @ONLY NEWLINE_STYLE DOS)
+# configure_file("nsis/gsmartcontrol.in.nsi" "nsis/gsmartcontrol.nsi" ESCAPE_QUOTES @ONLY NEWLINE_STYLE DOS)
 
 # NSIS helpers
 if (WIN32)
 	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/nsis/distribution.txt" TYPE DOC)
 
 	# nsis file, only for cross-compilation
-	if (NOT ${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
-		install(FILES "${CMAKE_CURRENT_BINARY_DIR}/nsis/gsmartcontrol.nsi" DESTINATION .)
-	endif()
+#	if (NOT ${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
+#		install(FILES "${CMAKE_CURRENT_BINARY_DIR}/nsis/gsmartcontrol.nsi" DESTINATION .)
+#	endif()
 endif()
 
 

packaging/cpack_options.cmake

@@ -28,7 +28,7 @@ set(APP_PACKAGE_NAME_DISPLAY "GSmartControl")
 #	set(APP_PACKAGE_NAME_DISPLAY "${APP_PACKAGE_NAME_DISPLAY} (64-Bit)")
 #endif()
 
-#set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
+set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
 if (WIN32)
 	# Default value is "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}".
 	set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}")  # appended to e.g. CPACK_NSIS_INSTALL_ROOT
@@ -42,12 +42,12 @@ set(CPACK_PACKAGE_VENDOR "Alexander Shaduri")
 #set(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_PROJECT_VERSION_PATCH})
 
 # Used by wix only?
-#set(APP_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/data/${APP_BRANDING_INTERNAL_APP_NAME}/package_description.txt")
+set(APP_PACKAGE_DESCRIPTION_FILE "${CMAKE_BINARY_DIR}/packaging/nsis/distribution.txt")
 #if (EXISTS "${APP_PACKAGE_DESCRIPTION_FILE}")
-#	set(CPACK_PACKAGE_DESCRIPTION_FILE "${APP_PACKAGE_DESCRIPTION_FILE}")
+	set(CPACK_PACKAGE_DESCRIPTION_FILE "${APP_PACKAGE_DESCRIPTION_FILE}")
 #endif()
 
-#set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${CMAKE_PROJECT_DESCRIPTION}")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${CMAKE_PROJECT_DESCRIPTION}")
 
 # Set to win32 or win64 by default, or CMAKE_SYSTEM_NAME for others.
 #set(CPACK_SYSTEM_NAME "${APP_TARGET_SYSTEM_NAME}")
@@ -57,7 +57,7 @@ set(CPACK_PACKAGE_VENDOR "Alexander Shaduri")
 #endif()
 
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt")
-set(CPACK_STRIP_FILES FALSE)  # update-smart-drivedb doesn't like this. TODO re-enable now that it's a script
+set(CPACK_STRIP_FILES TRUE)
 set(CPACK_SOURCE_STRIP_FILES FALSE)
 
 # Icon in Add/Remove Programs