diff options
| author | Martin Doege <mdoege@compuserve.com> | 2014-06-26 20:30:22 +0200 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2014-06-29 17:27:33 +0200 |
| commit | c410e9182d322a8c095ef94fbadf4d8f541e6b98 (patch) | |
| tree | b4626b67e9f6f10b43395013c7a275037aa463a3 /CMakeLists.txt | |
| parent | ee7af21e411d5d43ba67f4b67603f72e62b0570d (diff) | |
| download | minetest-c410e9182d322a8c095ef94fbadf4d8f541e6b98.tar.gz minetest-c410e9182d322a8c095ef94fbadf4d8f541e6b98.tar.bz2 minetest-c410e9182d322a8c095ef94fbadf4d8f541e6b98.zip | |
OS X compatibility fixes
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cb701a076..da7e46923 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,11 +72,9 @@ if(WIN32) set(EXAMPLE_CONF_DIR ".") set(LOCALEDIR "locale") elseif(APPLE) - # Random placeholders; this isn't usually used and may not work - # See https://github.com/toabi/minetest-mac/ - set(SHAREDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}") - set(BINDIR "bin") - set(DOCDIR "share/doc/${PROJECT_NAME}") + set(SHAREDIR ".") + set(BINDIR "./bin") + set(DOCDIR "./doc/${PROJECT_NAME}") set(EXAMPLE_CONF_DIR ${DOCDIR}) set(LOCALEDIR "locale") elseif(UNIX) # Linux, BSD etc @@ -171,7 +169,7 @@ install(FILES "doc/menu_lua_api.txt" DESTINATION "${DOCDIR}") install(FILES "doc/mapformat.txt" DESTINATION "${DOCDIR}") install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}") -if(UNIX) +if(UNIX AND NOT APPLE) install(FILES "doc/minetest.6" "doc/minetestserver.6" DESTINATION "${MANDIR}/man6") install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}") install(FILES "misc/minetest.appdata.xml" DESTINATION "${APPDATADIR}") @@ -211,15 +209,13 @@ if(WIN32) # This might be needed for some installer #set(CPACK_PACKAGE_EXECUTABLES bin/minetest.exe "Minetest" bin/minetestserver.exe "Minetest Server") elseif(APPLE) - # TODO # see http://cmake.org/Wiki/CMake:CPackPackageGenerators#Bundle_.28OSX_only.29 - # set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-osx") - set(CPACK_PACKAGE_ICON "") + set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/misc/mac/minetest-icon.icns) set(CPACK_BUNDLE_NAME ${PROJECT_NAME}) - set(CPACK_BUNDLE_ICON "") - set(CPACK_BUNDLE_PLIST "") - set(CPACK_BUNDLE_STARTUP_COMMAND "Contents/MacOS/${PROJECT_NAME}") + set(CPACK_BUNDLE_ICON ${CPACK_PACKAGE_ICON}) + set(CPACK_BUNDLE_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/misc/mac/Info.plist) + set(CPACK_BUNDLE_STARTUP_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/misc/mac/minetest-mac.sh) set(CPACK_GENERATOR "Bundle") else() set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-linux") |