From eeb35ff32525e9d0845d657d7c4552e88cb0550e Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Sat, 5 May 2012 22:17:36 +0000
Subject: [PATCH] Adjust generators for Apple build refs #221

git-svn-id: https://svn.nexusformat.org/definitions/trunk@1079 e2afd93b-eb5f-4fc1-b239-527b97798288
---
 CMakeLists.txt        | 19 +++++++++----------
 CPackOptions.cmake.in |  7 +++++++
 README.cmake.txt      |  1 +
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 774f9a5d24..9061c93e4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,20 +144,19 @@ INSTALL(FILES LGPL DESTINATION ${NEXUS_DEFINITIONS} COMPONENT definitions)
 configure_file("${PROJECT_SOURCE_DIR}/CPackOptions.cmake.in"
                                 "${PROJECT_BINARY_DIRECTORY}CPackOptions.cmake"
                                 @ONLY)
-set(CPACK_PROJECT_CONFIG_FILE "${PROJECT_BINARY_DIRECTORY}CPackOptions.cmake")
+set (CPACK_PROJECT_CONFIG_FILE "${PROJECT_BINARY_DIRECTORY}CPackOptions.cmake")
 set (CPACK_GENERATOR TGZ) # not use ZIP on UNIX as problem with symlinks
 set (CPACK_SOURCE_GENERATOR TGZ) # not use ZIP on UNIX as problem with symlinks
-if(UNIX)
-    set (CPACK_GENERATOR ${CPACK_GENERATOR};DEB;RPM)
-endif(UNIX)
 if(WIN32)
     set (CPACK_GENERATOR ${CPACK_GENERATOR};ZIP;NSIS)
     set (CPACK_SOURCE_GENERATOR ${CPACK_SOURCE_GENERATOR};ZIP) 
-endif(WIN32)
-if(APPLE)
-    set (CPACK_GENERATOR ${CPACK_GENERATOR};PackageMaker)
-endif(APPLE)
-if(CYGWIN)
-endif(CYGWIN)
+elseif(APPLE)
+    set (CPACK_GENERATOR ${CPACK_GENERATOR};PackageMaker;Bundle)
+elseif(CYGWIN)
+    set (CPACK_GENERATOR ${CPACK_GENERATOR};CygwinBinary)
+#    set (CPACK_SOURCE_GENERATOR ${CPACK_SOURCE_GENERATOR};CygwinSource) 
+elseif(UNIX)
+    set (CPACK_GENERATOR ${CPACK_GENERATOR};DEB;RPM)
+endif()
 # Include of CPack must always be last
 include(CPack)
diff --git a/CPackOptions.cmake.in b/CPackOptions.cmake.in
index a0185bee20..2234baa209 100644
--- a/CPackOptions.cmake.in
+++ b/CPackOptions.cmake.in
@@ -80,6 +80,13 @@ if (${CPACK_GENERATOR} STREQUAL "ZIP")
     set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY ON)
     set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
 endif()
+if (${CPACK_GENERATOR} STREQUAL "CygwinBinary")
+    set(CPACK_CYGWIN_PATCH_NUMBER 1)
+endif()
+if (${CPACK_GENERATOR} STREQUAL "PackageMaker")
+endif()
+if (${CPACK_GENERATOR} STREQUAL "Bundle")
+endif()
 
 set(CPACK_PACKAGE_CONTACT "NeXus Developers <nexus-tech@nexusformat.org>")
 
diff --git a/README.cmake.txt b/README.cmake.txt
index 1c195630ff..9e6a210fa2 100644
--- a/README.cmake.txt
+++ b/README.cmake.txt
@@ -60,3 +60,4 @@ Windows
 -------
 
 To build PDF documentation on windows cygwin is required - it is called from the windows build to run DBLATEX. 
+Check the definition of CYGPATH_EXECUTABLE in the CMake cache