[ismrmrd] 122/177: refine the packaging

[Ghislain Vaillant]

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 d0f8077d64353be7426e5f52884960c253aace5c
Author: Hui Xue <hui.xue at nih.gov>
Date:   Wed Oct 1 10:11:29 2014 -0400

    refine the packaging
---
 CMakeLists.txt               |  6 +++---
 cmake/cpack_options.cmake.in | 10 +++++-----
 cmake/ismrmrd_cpack.cmake    | 25 ++++++++++---------------
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f19d7e..c0445be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,12 +44,12 @@ endif (WIN32)
 #The ISMRMRD convention is to use version numbers with the format:
 #   XX.YY.ZZ (major, minor, patch)
 #
-#The major number increaments when the binary compatibility of
-#the fixed memory layout strucs (e.g. AcquisitionHeader) is broken.
+#The major number increments when the binary compatibility of
+#the fixed memory layout struts (e.g. AcquisitionHeader) is broken.
 #The minor number changes when there are changes to the XML schema for 
 #the flexible header. The micro number changes when there are small changes
 #in the utility libraries, that don't affect the data format itself.
-set(ISMRMRD_VERSION_MAJOR 0)
+set(ISMRMRD_VERSION_MAJOR 1)
 set(ISMRMRD_VERSION_MINOR 0)
 set(ISMRMRD_VERSION_PATCH 1) 
 
diff --git a/cmake/cpack_options.cmake.in b/cmake/cpack_options.cmake.in
index 50dc3bb..cd82556 100644
--- a/cmake/cpack_options.cmake.in
+++ b/cmake/cpack_options.cmake.in
@@ -11,9 +11,9 @@ set(CPACK_PACKAGE_NAME "@PROJECT_NAME@")
 set(CPACK_PACKAGE_VENDOR "https://sourceforge.net/p/ismrmrd")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ISMRM Raw Data Format (ISMRMRD)")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME_LOWER@")
-set(CPACK_RESOURCE_FILE_LICENSE "@CMAKE_CURRENT_SOURCE_DIR@/LICENSE")
-set(CPACK_RESOURCE_FILE_README "@CMAKE_CURRENT_SOURCE_DIR@/README.html")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "@CMAKE_CURRENT_SOURCE_DIR@/README.html")
+set(CPACK_RESOURCE_FILE_LICENSE "@CMAKE_SOURCE_DIR@/LICENSE")
+set(CPACK_RESOURCE_FILE_README "@CMAKE_SOURCE_DIR@/README.html")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "@CMAKE_SOURCE_DIR@/README.html")
 set(CPACK_PACKAGE_MAINTAINER "Michael S. Hansen <michael.hansen at nih.gov>")
 set(CPACK_PACKAGE_CONTACT "Michael S. Hansen <michael.hansen at nih.gov>")
 
@@ -25,8 +25,8 @@ set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Implementation of the ISMRMRD format.")
 
 # RPM specific
-set(CPACK_RPM_PACKAGE_REQUIRES "@RPM_PACKAGE_DEPENDS@")
-set(CPACK_RPM_PACKAGE_DESCRIPTION "Implementation of the ISMRMRD format.")
+# TODO: set(CPACK_RPM_PACKAGE_REQUIRES "@RPM_PACKAGE_DEPENDS@")
+# TODO: set(CPACK_RPM_PACKAGE_DESCRIPTION "Implementation of the ISMRMRD format.")
 
 # NSIS specific
 set(CPACK_NSIS_HELP_LINK "http:\\\\\\\\ismrmrd.sourceforge.net")
diff --git a/cmake/ismrmrd_cpack.cmake b/cmake/ismrmrd_cpack.cmake
index 8f3d6ec..05ef69d 100644
--- a/cmake/ismrmrd_cpack.cmake
+++ b/cmake/ismrmrd_cpack.cmake
@@ -8,11 +8,11 @@ if(UNIX)
   if(EXISTS ${DPKG_PROGRAM})
     list(APPEND CPACK_GENERATOR "DEB")
   endif(EXISTS ${DPKG_PROGRAM})
-  # RPM
-  find_program(RPMBUILD_PROGRAM rpmbuild)
-  if(EXISTS ${RPMBUILD_PROGRAM})
-    list(APPEND CPACK_GENERATOR "RPM")
-  endif(EXISTS ${RPMBUILD_PROGRAM})
+  # TODO: RPM
+  #find_program(RPMBUILD_PROGRAM rpmbuild)
+  #if(EXISTS ${RPMBUILD_PROGRAM})
+  #  list(APPEND CPACK_GENERATOR "RPM")
+  #endif(EXISTS ${RPMBUILD_PROGRAM})
 endif(UNIX)
 
 if(WIN32)
@@ -20,19 +20,14 @@ if(WIN32)
     list(APPEND CPACK_GENERATOR "NSIS")    
 endif(WIN32)
 
-list(APPEND CPACK_SOURCE_GENERATOR "TGZ")
-list(APPEND CPACK_SOURCE_GENERATOR "ZIP")
+# TODO: list(APPEND CPACK_SOURCE_GENERATOR "TGZ")
+# TODO: list(APPEND CPACK_SOURCE_GENERATOR "ZIP")
 list(APPEND CPACK_SOURCE_IGNORE_FILES ";.git;.gitignore;todo.txt;_clang-format;build/")
 
-# set dependencies explictly
+# set dependencies explicitly
 include(InstallRequiredSystemLibraries)
-set(DEBIAN_PACKAGE_DEPENDS "libhdf5-dev")
-set(RPM_PACKAGE_DEPENDS "hdf5-devel")
+set(DEBIAN_PACKAGE_DEPENDS "libhdf5-7, libfftw3-3, libboost-program-options-dev")
+# TODO: set(RPM_PACKAGE_DEPENDS "hdf5-devel")
 
 # where the package metadata are
 set(ISMRMRD_CPACK_CFG_FILE "${PROJECT_BINARY_DIR}/cpack_options.cmake")
-
-# where the package to be installed
-if (NOT WIN32)
-    set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
-endif (NOT WIN32)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git