Skip to content
Snippets Groups Projects
Commit 387be08d authored by Lars Bilke's avatar Lars Bilke
Browse files

OS X package names contain OS X version, e.g. 10.10 for Yosemite.

- Enabled Zip packaging on Mac OS.
parent 34d456a2
No related branches found
No related tags found
No related merge requests found
...@@ -23,3 +23,20 @@ CMAKE_POLICY(SET CMP0011 OLD) ...@@ -23,3 +23,20 @@ CMAKE_POLICY(SET CMP0011 OLD)
# Get the hostname # Get the hostname
SITE_NAME(HOSTNAME) SITE_NAME(HOSTNAME)
# Compute OS X version number
IF(APPLE)
IF(CMAKE_SYSTEM_VERSION VERSION_EQUAL 12.0)
SET(OSX_VERSION 10.8 CACHE STRING "OS X version number")
SET(OSX_VERSION_NAME CACHE STRING "Mountain Lion")
ENDIF()
IF(CMAKE_SYSTEM_VERSION VERSION_EQUAL 13.0)
SET(OSX_VERSION 10.9 CACHE STRING "OS X version number")
SET(OSX_VERSION_NAME CACHE STRING "Mavericks")
ENDIF()
IF(CMAKE_SYSTEM_VERSION VERSION_EQUAL 14.0)
SET(OSX_VERSION 10.10 CACHE STRING "OS X version number")
SET(OSX_VERSION_NAME CACHE STRING "Yosemite")
ENDIF()
ENDIF()
MARK_AS_ADVANCED(OSX_VERSION OSX_VERSION_NAME)
...@@ -12,7 +12,7 @@ SET(CPACK_PACKAGE_VERSION_MAJOR "${OGS_VERSION_MAJOR}") ...@@ -12,7 +12,7 @@ SET(CPACK_PACKAGE_VERSION_MAJOR "${OGS_VERSION_MAJOR}")
SET(CPACK_PACKAGE_VERSION_MINOR "${OGS_VERSION_MINOR}") SET(CPACK_PACKAGE_VERSION_MINOR "${OGS_VERSION_MINOR}")
SET(CPACK_PACKAGE_VERSION_PATCH "${OGS_VERSION_PATCH}") SET(CPACK_PACKAGE_VERSION_PATCH "${OGS_VERSION_PATCH}")
IF(APPLE) IF(APPLE)
SET(CPACK_PACKAGE_FILE_NAME "ogs-${OGS_VERSION}-OSX-x${BITS}") SET(CPACK_PACKAGE_FILE_NAME "ogs-${OGS_VERSION}-OSX-${OSX_VERSION}-x${BITS}")
SET(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}) SET(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME})
ELSE() ELSE()
SET(CPACK_PACKAGE_FILE_NAME "ogs-${OGS_VERSION}-${CMAKE_SYSTEM}-x${BITS}") SET(CPACK_PACKAGE_FILE_NAME "ogs-${OGS_VERSION}-${CMAKE_SYSTEM}-x${BITS}")
......
SET(CPACK_GENERATOR "DragNDrop") SET(CPACK_GENERATOR DragNDrop ZIP)
SET(CPACK_DMG_FORMAT "UDBZ") SET(CPACK_DMG_FORMAT "UDBZ")
# See http://stackoverflow.com/a/16662169/80480 how to create the DS_Store file. # See http://stackoverflow.com/a/16662169/80480 how to create the DS_Store file.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment