Package HDF DLLs

Author: FreddieAkeroyd

CMakeLists.txt

@@ -281,6 +281,14 @@ else()
 	set(ARCHSUFFIX "")
 endif()
 
+if(WIN32)
+	file(GLOB HDF4_DLLS "${HDF4_LIBRARY_DIRS}/../bin/*.dll")
+	# for some reason HDF5_LIBRARY_DIRS is blank
+	file(GLOB HDF5_DLLS "${HDF5_INCLUDE_DIRS}/../bin/*.dll")
+	file(GLOB_RECURSE MXML_DLLS "${MXML_LIBRARY_DIRS}/*.dll")
+	install(FILES ${HDF4_DLLS} ${HDF5_DLLS} ${MXML_DLLS} DESTINATION bin COMPONENT Runtime)
+endif()
+
 file(TO_NATIVE_PATH ${PROJECT_SOURCE_DIR} PROJECT_SOURCE_DIR_NATIVE) 
 file(TO_NATIVE_PATH ${PROJECT_BINARY_DIR} PROJECT_BINARY_DIR_NATIVE) 
 string(REPLACE "\\" "\\\\" PROJECT_SOURCE_DIR_NATIVE_D ${PROJECT_SOURCE_DIR_NATIVE})

CPackOptions.cmake.in

@@ -42,9 +42,9 @@ endif()
 
 set (CPACK_PACKAGE_NAME "NeXus")
 set (CPACK_PACKAGE_VENDOR "NeXus International Advisory Committee")
-set (CPACK_PACKAGE_VERSION_MAJOR "4")
-set (CPACK_PACKAGE_VERSION_MINOR "3")
-set (CPACK_PACKAGE_VERSION_PATCH "0")
+set (CPACK_PACKAGE_VERSION_MAJOR "@NEXUS_VERSION_MAJOR@")
+set (CPACK_PACKAGE_VERSION_MINOR "@NEXUS_VERSION_MINOR@")
+set (CPACK_PACKAGE_VERSION_PATCH "@NEXUS_VERSION_PATCH@")
 set (CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 set (CPACK_PACKAGE_CONTACT "NeXus Developers <nexus-tech@nexusformat.org>")
 set (CPACK_PACKAGE_DESCRIPTION_FILE "@PROJECT_SOURCE_DIR@/cmake_include/nexus_description.txt")
@@ -135,7 +135,8 @@ if (${CPACK_GENERATOR} STREQUAL "NSIS")
     set(CPACK_PACKAGE_ICON "@PROJECT_SOURCE_DIR_NATIVE_D@\\InstallerBits\\nexus.ico")
 	set(CPACK_NSIS_MUI_ICON "@PROJECT_SOURCE_DIR_NATIVE_D@\\InstallerBits\\nexus.ico")
 	set(CPACK_NSIS_MUI_UNIICON "@PROJECT_SOURCE_DIR_NATIVE_D@\\InstallerBits\\nexus.ico")
-	set(CPACK_NSIS_MENU_LINKS "http://www.nexusformat.org/" "NeXus Web Site" "bin\\nxvalidate.bat" "NXvalidate")	
+#	set(CPACK_NSIS_MENU_LINKS "http://www.nexusformat.org/" "NeXus Web Site" "bin\\nxvalidate.bat" "NXvalidate")	
+	set(CPACK_NSIS_MENU_LINKS "http://www.nexusformat.org/" "NeXus Web Site")	
 	if (@ARCH64@)
 		set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
 		set(CPACK_NSIS_DEFINES "!define NEXUSDIRENVSUFFIX 64")	
@@ -158,7 +159,8 @@ if(WIN32)
 else()
     set(NXVALIDATE nxvalidate)
 endif()
-set(CPACK_CREATE_DESKTOP_LINKS "nxbrowse" ${NXVALIDATE})
+#set(CPACK_CREATE_DESKTOP_LINKS "nxbrowse" "nxbrowse")
+
 set(CPACK_PACKAGE_EXECUTABLES "nxbrowse" "NXbrowse")
 
 #cpack_add_component(Runtime