aboutsummaryrefslogtreecommitdiffstats
path: root/README.cmake
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2017-04-05 12:15:27 -0700
committerGuy Harris <guy@alum.mit.edu>2017-04-05 19:16:22 +0000
commit357cfd3b035d1ba6438e82cc1cbec105874206b6 (patch)
tree58a77b4dc8e1192db6278716b320bf42a18ded8f /README.cmake
parent1f94d34f43055ea47fc9426e1720bdb4b7397dd9 (diff)
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 'README.cmake')
-rw-r--r--README.cmake12
1 files changed, 6 insertions, 6 deletions
diff --git a/README.cmake b/README.cmake
index 645cfd67c4..90d6f5437f 100644
--- a/README.cmake
+++ b/README.cmake
@@ -57,7 +57,7 @@ Note 1:
# http://public.kitware.com/Bug/view.php?id=13818
-DPYTHON_EXECUTABLE=c:/Python27/python
- # Disable building an application bundle (Wireshark.app) on OS X
+ # Disable building an application bundle (Wireshark.app) on macOS
-DENABLE_APPLICATION_BUNDLE=OFF
# Qt Creator expects .cbp files when used with CMake.
@@ -155,13 +155,13 @@ All the executables now build from clean source on:
* 32 bit Ubuntu 10.04
* 64 bit Ubuntu 14.04
* 64 bit Debian Wheezy
-* 32 bit OS X
-* 64 bit OS X
+* 32 bit Mac OS X
+* 64 bit {Mac} OS X/macOS
* 32 bit Windows using Visual C++ 2013
* 64 bit Windows using Visual C++ 2013
* 64 bit Solaris 10
-The Buildbot runs CMake steps on Ubuntu, Win32, Win64, OS X, and Solaris.
+The Buildbot runs CMake steps on Ubuntu, Win32, Win64, macOS, and Solaris.
Windows packages are built using CMake steps.
What needs to be done?
@@ -172,9 +172,9 @@ What needs to be done?
- Guides are not installed.
- Build source package (using CPack).
This is obsolete if we decide to release VCS snapshots instead
-- Build packages using CPack: tarball, Windows installer + PortableApps, OS X
+- Build packages using CPack: tarball, Windows installer + PortableApps, macOS
installer dmg, RPM, SVR4. This includes setting OS target version stuff
- appropriately for OS X. We currently use NSIS for the Windows installer but
+ appropriately for macOS. We currently use NSIS for the Windows installer but
should probably use WiX instead.
- Add support for cmake configurations.
- Get cross-compilation working (or ensure it does). It works with autofoo--and