Adjust generators for Apple build

refs #221

git-svn-id: https://svn.nexusformat.org/definitions/trunk@1079 e2afd93b-eb5f-4fc1-b239-527b97798288

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)

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 <[email protected]>")
 

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