osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Install CMake 3.5.2 on Lion and 3.7.2 on later releases. 

See the comment for the painful details.

Change-Id: Ic82de342b1d9c8d118e08c7b298ab7514a6f4ed3
Reviewed-on: https://code.wireshark.org/review/27651
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2018-05-18 16:40:17 -07:00
parent b1de8c87a1
commit 7138fc8dc5
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/macos-setup.sh
View File

@ -50,12 +50,19 @@ LZIP_VERSION=1.19
#
# CMake is required to do the build.
#
# XXX - some versions fail on Lion due to issues with Lion's libc++, and
# CMake 3.5 and 3.6 have an annoying "Make sure the combination of SDK
# and Deployment Target are allowed" check that fails in some cases.
# Figuring out what version to default to is a work in progress.
# Sigh. CMake versions 3.7 and later fail on Lion due to issues with
# Lion's libc++, and CMake 3.5 and 3.6 have an annoying "Make sure the
# combination of SDK and Deployment Target are allowed" check that fails
# in some cases.
#
CMAKE_VERSION=${CMAKE_VERSION-3.5.2}
# So if you're on Lion, we choose version 3.5.2, otherwise we choose
# version 3.7.2.
#
if [[ $DARWIN_MAJOR_VERSION -gt 11 ]]; then
CMAKE_VERSION=${CMAKE_VERSION-3.7.2}
else
CMAKE_VERSION=${CMAKE_VERSION-3.5.2}
fi
#
# Ninja isn't required, as make is provided with Xcode, but it is