[ismrmrd] 104/177: use cpack packaging only in linux

[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 8c4590b8e651b7ad43e701a46385dd93b2fdd055
Merge: dcda351 1098b09
Author: Hui Xue <hui.xue at nih.gov>
Date:   Fri Sep 26 09:48:49 2014 -0400

    use cpack packaging only in linux

 cmake/ismrmrd_cpack.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc cmake/ismrmrd_cpack.cmake
index 0a53d48,eb9ae14..8f3d6ec
--- a/cmake/ismrmrd_cpack.cmake
+++ b/cmake/ismrmrd_cpack.cmake
@@@ -33,6 -33,5 +33,6 @@@ set(RPM_PACKAGE_DEPENDS "hdf5-devel"
  set(ISMRMRD_CPACK_CFG_FILE "${PROJECT_BINARY_DIR}/cpack_options.cmake")
  
  # where the package to be installed
 -set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX})
 -set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 +if (NOT WIN32)
 +    set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
- endif (NOT WIN32)
++endif (NOT WIN32)

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