ENABLE_APP_BUNDLE -> ENABLE_OS_SPECIFIC_INSTALL

CMakeLists.txt

@@ -24,7 +24,6 @@ set(DEFAULT ON CACHE INTERNAL "Default value for enabled-by-default options")
 option(ENABLE_3M "Enable 3M" OFF)
 option(ENABLE_ACIS "Enable ACIS geometrical models" ${DEFAULT})
 option(ENABLE_ANN "Enable ANN to compute Approximate Nearest Neighbors" ${DEFAULT})
-option(ENABLE_APP_BUNDLE "Create .app bundle on Mac when installing" ${DEFAULT})
 option(ENABLE_BAMG "Enable Bamg mesh generator" ${DEFAULT})
 option(ENABLE_BFGS "Enable BFGS" ${DEFAULT})
 option(ENABLE_BLAS_LAPACK "Use BLAS and Lapack for linear algebra" ON)
@@ -53,6 +52,7 @@ option(ENABLE_NETGEN "Enable Netgen mesh generator" ${DEFAULT})
 option(ENABLE_OCC "Enable Open CASCADE geometrical models" ${DEFAULT})
 option(ENABLE_ONELAB "Enable OneLab solver interface" ${DEFAULT})
 option(ENABLE_ONELAB_METAMODEL "Enable OneLab metamodel" ${DEFAULT})
+option(ENABLE_OS_SPECIFIC_INSTALL "Use OS-specific (e.g. app bundle) install" ${DEFAULT})
 option(ENABLE_OSMESA "Use OSMesa for offscreen rendering" OFF)
 option(ENABLE_PARSER "Build the GEO file parser" ${DEFAULT})
 option(ENABLE_PETSC "Enable PETSc linear algebra solvers" ${DEFAULT})
@@ -1151,9 +1151,15 @@ macro(unix2dos VARNAME)
 endmacro(unix2dos)
 
 if(WIN32 OR CYGWIN)
-  set(GMSH_BIN .)
-  set(GMSH_DOC .)
-  set(GMSH_MAN .)
+  if(ENABLE_OS_SPECIFIC_INSTALL)
+    set(GMSH_BIN .)
+    set(GMSH_DOC .)
+    set(GMSH_MAN .)
+  else(ENABLE_OS_SPECIFIC_INSTALL)
+    set(GMSH_BIN bin)
+    set(GMSH_DOC share/doc/gmsh)
+    set(GMSH_MAN share/man/man1)
+  endif(ENABLE_OS_SPECIFIC_INSTALL)
   if(CYGWIN)
     unix2dos(GMSH_API)
     unix2dos(WELCOME_FILE)
@@ -1162,7 +1168,7 @@ if(WIN32 OR CYGWIN)
     unix2dos(TUTORIAL_FILES)
     unix2dos(DEMO_FILES)
   endif(CYGWIN)
-elseif(APPLE AND ENABLE_APP_BUNDLE)
+elseif(APPLE AND ENABLE_OS_SPECIFIC_INSTALL)
   # set these so that the files get installed nicely in the MacOSX
   # .app bundle
   set(GMSH_BIN ../MacOS)
@@ -1293,7 +1299,7 @@ if(UNIX)
   set(CPACK_INSTALL_COMMANDS "rm -rf ${CMAKE_CURRENT_BINARY_DIR}/_CPack_Packages")
 endif(UNIX)
 
-if(APPLE AND ENABLE_APP_BUNDLE)
+if(APPLE AND ENABLE_OS_SPECIFIC_INSTALL)
   set(CPACK_GENERATOR Bundle)
   set(CPACK_BUNDLE_NAME Gmsh)
   file(READ ${CMAKE_CURRENT_SOURCE_DIR}/utils/misc/gmsh_app.plist F0)
@@ -1312,9 +1318,9 @@ if(APPLE AND ENABLE_APP_BUNDLE)
   set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIcons.icns)
 elseif(WIN32 OR CYGWIN)
   set(CPACK_GENERATOR ZIP)
-else(APPLE AND ENABLE_APP_BUNDLE)
+else(APPLE AND ENABLE_OS_SPECIFIC_INSTALL)
   set(CPACK_GENERATOR TGZ)
-endif(APPLE AND ENABLE_APP_BUNDLE)
+endif(APPLE AND ENABLE_OS_SPECIFIC_INSTALL)
 
 if(ENABLE_WRAP_PYTHON)
   find_package(SWIG)