diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-04-05 12:15:27 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-05 19:16:22 +0000 |
| commit | 357cfd3b035d1ba6438e82cc1cbec105874206b6 (patch) | |
| tree | 58a77b4dc8e1192db6278716b320bf42a18ded8f /cmake | |
| parent | 1f94d34f43055ea47fc9426e1720bdb4b7397dd9 (diff) | |
| download | wireshark-357cfd3b035d1ba6438e82cc1cbec105874206b6.tar.gz | |
A bunch of "{Mac} OS X" -> "macOS" changes.
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X
10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was
sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS
X" from 10.8 to 10.11.
Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3
Reviewed-on: https://code.wireshark.org/review/20933
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindM.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/FindOS_X_FRAMEWORKS.cmake | 8 | ||||
| -rw-r--r-- | cmake/modules/FindPCAP.cmake | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cmake/modules/FindM.cmake b/cmake/modules/FindM.cmake index 414ededbff..2fb5429353 100644 --- a/cmake/modules/FindM.cmake +++ b/cmake/modules/FindM.cmake @@ -13,7 +13,7 @@ IF (M_INCLUDE_DIRS) ENDIF (M_INCLUDE_DIRS) # -# On OS X, make sure we do *NOT* find math.h in the Kernel framework, +# On macOS, make sure we do *NOT* find math.h in the Kernel framework, # as that will convince CMake to cause the build to look there for # headers. # diff --git a/cmake/modules/FindOS_X_FRAMEWORKS.cmake b/cmake/modules/FindOS_X_FRAMEWORKS.cmake index 74abccc411..52798c9c6b 100644 --- a/cmake/modules/FindOS_X_FRAMEWORKS.cmake +++ b/cmake/modules/FindOS_X_FRAMEWORKS.cmake @@ -1,16 +1,16 @@ # -# - Find OS X frameworks -# Find various OS X frameworks if we're on OS X +# - Find macOS frameworks +# Find various macOS frameworks if we're on macOS # # APPLE_APPLICATION_SERVICES_LIBRARY - ApplicationServices framework # APPLE_CORE_FOUNDATION_LIBRARY - CoreFoundation frameowkr # APPLE_SYSTEM_CONFIGURATION_LIBRARY - SystemConfiguration framework -# HAVE_OS_X_FRAMEWORKS - True if we're on OS X +# HAVE_OS_X_FRAMEWORKS - True if we're on macOS if(APPLE) # - # We assume that APPLE means OS X so that we have the OS X + # We assume that APPLE means macOS so that we have the macOS # frameworks. # set(HAVE_OS_X_FRAMEWORKS 1) diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake index 69dffba4a1..85053abff4 100644 --- a/cmake/modules/FindPCAP.cmake +++ b/cmake/modules/FindPCAP.cmake @@ -58,7 +58,7 @@ if( PCAP_FOUND ) # # Note: for pcap_breakloop() and pcap_findalldevs(), the autoconf script # checks for more than just whether the function exists, it also checks - # for whether pcap.h declares it; Mac OS X software/security updates can + # for whether pcap.h declares it; macOS software/security updates can # update libpcap without updating the headers. # check_function_exists( "pcap_breakloop" HAVE_PCAP_BREAKLOOP ) |