Package Visual Studio DLLs (makes VS Redistributable installers obsolete).

Package OpenMP library as well. This works since CMake 3.1. Set some CMake deprecation policies.

CMakeLists.txt

@@ -5,6 +5,10 @@
 # Specify minimum CMake version
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 
+# Set CMake policies
+CMAKE_POLICY(SET CMP0011 OLD)
+CMAKE_POLICY(SET CMP0054 NEW)
+
 # Project name
 PROJECT( OGS-6 )
 

scripts/cmake/MSVCPaths.cmake

@@ -14,9 +14,11 @@ IF(MSVC)
 	ENDIF()
 	GET_FILENAME_COMPONENT(VS_DIR "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${MSVC_NUMBER}\\Setup\\VS;ProductDir]" REALPATH)
 	GET_FILENAME_COMPONENT(VS_EXPRESS_DIR "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\${MSVC_NUMBER}\\Setup\\VS;ProductDir]" REALPATH)
+	
+	SET(X86_TMP "ProgramFiles(x86)")
 	SET(MSVC_INSTALL_PATHS
 		${VS_DIR} ${VS_EXPRESS_DIR}
-		"$ENV{ProgramFiles}/Microsoft Visual Studio ${MSVC_NUMBER}"
-		"$ENV{ProgramFiles(x86)}/Microsoft Visual Studio ${MSVC_NUMBER}"
+		"$ENV{ProgramFiles}/Microsoft\ Visual\ Studio\ ${MSVC_NUMBER}"
+		"$ENV{${X86_TMP}}/Microsoft\ Visual\ Studio\ ${MSVC_NUMBER}"
 		CACHE STRING "" FORCE)
 ENDIF()

scripts/cmake/packaging/PackagingWin.cmake

+SET(CMAKE_INSTALL_OPENMP_LIBRARIES ON)
+INCLUDE(InstallRequiredSystemLibraries)
 SET(CPACK_GENERATOR NSIS ZIP)
 SET(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/scripts/packaging/ogs-de-icon.ico)
 FILE(TO_NATIVE_PATH "${CMAKE_SOURCE_DIR}/Documentation/OpenGeoSys-Logo.bmp" BACKGROUND_IMAGE)