[ismrmrd] 91/177: add windows packaging and windows install dependencies
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Wed Jan 14 20:02:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to annotated tag v1.1.0.beta.1
in repository ismrmrd.
commit 24bcf1d7d8a290398522511260688b7cbc599187
Author: Hui Xue <hui.xue at nih.gov>
Date: Thu Sep 25 11:07:07 2014 -0400
add windows packaging and windows install dependencies
---
CMakeLists.txt | 20 ++++++++++++++++++++
cmake/cpack_options.cmake.in | 5 +++++
cmake/ismrmrd_cpack.cmake | 5 +++++
3 files changed, 30 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62cb5f0..c492baf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,11 @@ set (ISMRMRD_CMAKE_DIR ${PROJECT_SOURCE_DIR}/cmake CACHE PATH
# and include it to the search list
list(APPEND CMAKE_MODULE_PATH ${ISMRMRD_CMAKE_DIR})
+# whether to install dependencies
+if (WIN32)
+ OPTION(ISMRMRD_INSTALL_DEPENDENCIES "Install ismrmrd dependencies in windows" Off)
+endif (WIN32)
+
# set the build type to Release if not specified
IF(NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE Release CACHE STRING
@@ -88,6 +93,21 @@ set(ISMRMRD_SOVERSION ${ISMRMRD_VERSION_MAJOR}.${ISMRMRD_VERSION_MINOR})
# required packages for main library
find_package(HDF5 1.8 COMPONENTS C REQUIRED)
+# in windows, install the HDF5 dependencies
+if (WIN32)
+ if (ISMRMRD_INSTALL_DEPENDENCIES)
+ if ( HDF5_FOUND )
+ if(DEFINED ENV{HDF5_ROOT})
+ set(HDF5_BIN_DIR $ENV{HDF5_ROOT}/bin)
+ else (DEFINED ENV{HDF5_ROOT})
+ set(HDF5_BIN_DIR ${HDF5_C_INCLUDE_DIR}/../bin)
+ endif (DEFINED ENV{HDF5_ROOT})
+ message("Install hdf5 libraries from ${HDF5_BIN_DIR} ")
+ install( DIRECTORY ${HDF5_BIN_DIR} DESTINATION lib FILES_MATCHING PATTERN "*.dll" )
+ endif (HDF5_FOUND)
+ endif (ISMRMRD_INSTALL_DEPENDENCIES)
+endif (WIN32)
+
# include directories for main library
include_directories(
include
diff --git a/cmake/cpack_options.cmake.in b/cmake/cpack_options.cmake.in
index 66c82b9..2fb9c62 100644
--- a/cmake/cpack_options.cmake.in
+++ b/cmake/cpack_options.cmake.in
@@ -28,6 +28,11 @@ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Implementation of the ISMRMRD format.")
set(CPACK_RPM_PACKAGE_REQUIRES "@RPM_PACKAGE_DEPENDS@")
set(CPACK_RPM_PACKAGE_DESCRIPTION "Implementation of the ISMRMRD format.")
+# NSIS specific
+set(CPACK_NSIS_HELP_LINK "http:\\\\\\\\ismrmrd.sourceforge.net")
+set(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\ismrmrd.sourceforge.net")
+set(CPACK_NSIS_MODIFY_PATH ON)
+
# Output filename of the generated tarball / package
set(CPACK_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at -@ISMRMRD_VERSION_STRING@")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "@PROJECT_NAME_LOWER at -@ISMRMRD_VERSION_STRING@")
diff --git a/cmake/ismrmrd_cpack.cmake b/cmake/ismrmrd_cpack.cmake
index de94909..a68f428 100644
--- a/cmake/ismrmrd_cpack.cmake
+++ b/cmake/ismrmrd_cpack.cmake
@@ -15,6 +15,11 @@ if(UNIX)
endif(EXISTS ${RPMBUILD_PROGRAM})
endif(UNIX)
+if(WIN32)
+ # NSLS
+ list(APPEND CPACK_GENERATOR "NSIS")
+endif(WIN32)
+
list(APPEND CPACK_SOURCE_GENERATOR "TGZ")
list(APPEND CPACK_SOURCE_GENERATOR "ZIP")
list(APPEND CPACK_SOURCE_IGNORE_FILES ";.git;.gitignore;todo.txt;_clang-format;build/")
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git
More information about the debian-science-commits
mailing list