|
@@ -73,7 +73,7 @@ if(WIN32)
|
|
|
set(LOCALEDIR "locale")
|
|
|
elseif(APPLE)
|
|
|
set(SHAREDIR ".")
|
|
|
- set(BINDIR "./bin")
|
|
|
+ set(BINDIR ".")
|
|
|
set(DOCDIR "./doc/${PROJECT_NAME}")
|
|
|
set(EXAMPLE_CONF_DIR ${DOCDIR})
|
|
|
set(LOCALEDIR "locale")
|
|
@@ -213,13 +213,11 @@ if(WIN32)
|
|
|
# This might be needed for some installer
|
|
|
#set(CPACK_PACKAGE_EXECUTABLES bin/minetest.exe "Minetest" bin/minetestserver.exe "Minetest Server")
|
|
|
elseif(APPLE)
|
|
|
- # 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 ${CMAKE_CURRENT_SOURCE_DIR}/misc/mac/minetest-icon.icns)
|
|
|
+ set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/misc/minetest-icon.icns)
|
|
|
set(CPACK_BUNDLE_NAME ${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_BUNDLE_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/misc/Info.plist)
|
|
|
set(CPACK_GENERATOR "Bundle")
|
|
|
else()
|
|
|
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-linux")
|