Skip to content

Commit

Permalink
Re #6564. Remove items applicable to older OS X.
Browse files Browse the repository at this point in the history
i.e. versions that we no longer support.
  • Loading branch information
RussellTaylor committed Mar 21, 2014
1 parent 6ea8f6e commit 384038b
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions Code/Mantid/Build/CMake/DarwinSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if ( PYTHON_VERSION_MAJOR )
message ( STATUS "Python version is " ${PY_VER} )
else ()
# Older versions of CMake don't set these variables so just assume 2.6 as before
set ( PY_VER 2.6 )
set ( PY_VER 2.7 )
endif ()

###########################################################################
Expand Down Expand Up @@ -101,22 +101,18 @@ execute_process(
# Strip off any /CR or /LF
string(STRIP ${OSX_VERSION} OSX_VERSION)

if (OSX_VERSION VERSION_LESS 10.6)
message (FATAL_ERROR "The minimum supported version of Mac OS X is 10.6 (Snow Leopard).")
endif()

if (OSX_VERSION VERSION_GREATER 10.6 OR OSX_VERSION VERSION_EQUAL 10.6)
set ( OSX_CODENAME "Snow Leopard" )
endif()

if (OSX_VERSION VERSION_GREATER 10.7 OR OSX_VERSION VERSION_EQUAL 10.7)
set ( OSX_CODENAME "Lion")
if (OSX_VERSION VERSION_LESS 10.8)
message (FATAL_ERROR "The minimum supported version of Mac OS X is 10.8 (Mountain Lion).")
endif()

if (OSX_VERSION VERSION_GREATER 10.8 OR OSX_VERSION VERSION_EQUAL 10.8)
set ( OSX_CODENAME "Mountain Lion")
endif()

if (OSX_VERSION VERSION_GREATER 10.9 OR OSX_VERSION VERSION_EQUAL 10.9)
set ( OSX_CODENAME "Mavericks")
endif()

message (STATUS "Operating System: Mac OS X ${OSX_VERSION} (${OSX_CODENAME})")

string (REPLACE " " "" CPACK_SYSTEM_NAME ${OSX_CODENAME})
Expand Down

0 comments on commit 384038b

Please sign in to comment.