better app bundle on Mac (should allow system menu from command line!)

CMakeLists.txt

@@ -915,6 +915,7 @@ endmacro(unix2dos)
 if(WIN32)
   set(GMSH_BIN .)
   set(GMSH_DOC .)
+  set(GMSH_MAN .)
   if(CYGWIN)
     unix2dos(GMSH_API)
     unix2dos(WELCOME_FILE)
@@ -923,9 +924,14 @@ if(WIN32)
     unix2dos(TUTORIAL_FILES)
     unix2dos(DEMO_FILES)
   endif(CYGWIN)
+elseif(APPLE)
+  set(GMSH_BIN ../MacOS)
+  set(GMSH_DOC ../../../Documentation)
+  set(GMSH_MAN ../../../Documentation)
 else(WIN32)
   set(GMSH_BIN bin)
   set(GMSH_DOC share/doc/gmsh)
+  set(GMSH_MAN share/man/man1)
 endif(WIN32)
 
 # mark targets as optional so we can install them separately if needed
@@ -939,7 +945,7 @@ install(FILES ${CREDITS_FILE} DESTINATION ${GMSH_DOC})
 install(FILES ${TUTORIAL_FILES} DESTINATION ${GMSH_DOC}/tutorial)
 install(FILES ${DEMO_FILES} DESTINATION ${GMSH_DOC}/demos)
 if(UNIX AND NOT CYGWIN)
-  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/gmsh.1 DESTINATION share/man/man1)
+  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/gmsh.1 DESTINATION ${GMSH_MAN})
 endif(UNIX AND NOT CYGWIN)
 
 find_program(MAKEINFO makeinfo)
@@ -1021,7 +1027,6 @@ if(APPLE)
   file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Info.plist "${F1}")
   set(CPACK_BUNDLE_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
   set(CPACK_BUNDLE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIcons.icns)
-  set(CPACK_BUNDLE_STARTUP_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/utils/misc/gmsh_app.sh)
   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsGeo.icns DESTINATION .
           RENAME GmshGeo.icns)
   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsMsh.icns DESTINATION .

utils/misc/gmsh_app.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
   <dict>
     <key>CFBundleName</key><string>Gmsh</string>
-    <key>CFBundleExecutable</key><string>Gmsh</string>
+    <key>CFBundleExecutable</key><string>gmsh</string>
     <key>CFBundlePackageType</key><string>APPL</string>
     <key>CFBundleVersion</key><string>GMSH_VERSION</string>
     <key>CFBundleShortVersionString</key><string>GMSH_VERSION</string>

utils/misc/gmsh_app.sh

-#!/bin/sh
-
-GMSH_BUNDLE="`echo "$0" | sed -e 's/\/Contents\/MacOS\/Gmsh//'`"
-GMSH_RESOURCES="$GMSH_BUNDLE/Contents/Resources"
-exec "$GMSH_RESOURCES/bin/gmsh"