diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-04-25 09:54:00 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-04-25 16:54:34 +0000 |
| commit | 27a67152428305e4d52fe0c2ee55326b367c2029 (patch) | |
| tree | 1ce1cd26c587842fb258124974bb27c86f8b9df1 | |
| parent | 0a51618302f340efc4417f0cab059285f5800002 (diff) | |
Put references to autotools in the past tense.
In CMake files, we don't do some checks that our autotools scripts did;
speak of those in the past tense, as the autotools scripts are gone.
(Leave the comments there, to note that we *might* have to reinstate
those tests, although they're for old versions of macOS and GCC.)
In CMake files, we use some #defines because that's what autotools did;
speak of those in the past tense as well.
Change-Id: I594fe8225cf94b5087093febc11f6b0a7e42e7cd
Reviewed-on: https://code.wireshark.org/review/27149
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | cmake/modules/FindPCAP.cmake | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 78b662d90f..6f57c882c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -518,7 +518,7 @@ else() # ! MSVC # least some Xcode versions that come with Mac OS X # 10.5, complain about variables in function and # function pointer *declarations* shadowing other - # variables. The autoconf script checks for that; we + # variables. The autoconf script checked for that; we # don't. -Wshadow -Wno-pointer-sign @@ -527,7 +527,7 @@ else() # ! MSVC # # Some versions of GCC, such as 4.3.2 and 4.4.5, # generate logical-op warnings when strchr() is given a - # constant string. The autoconf script checks for that; + # constant string. The autoconf script checked for that; # we don't. # -Wlogical-op @@ -1206,17 +1206,17 @@ if (Qt5Widgets_FOUND) set (QT_LIBRARIES ${Qt5Widgets_LIBRARIES} ${Qt5PrintSupport_LIBRARIES}) if(Qt5Multimedia_FOUND) set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Multimedia_LIBRARIES}) - # That's the name autofoo uses + # That's the name autotools used set(QT_MULTIMEDIA_LIB 1) endif() if(Qt5Svg_FOUND) set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5Svg_LIBRARIES}) - # That's the name autofoo uses + # That's the name autotools used set(QT_SVG_LIB 1) endif() if(Qt5MacExtras_FOUND) set (QT_LIBRARIES ${QT_LIBRARIES} ${Qt5MacExtras_LIBRARIES}) - # That's the name autofoo uses + # That's the name autotools used set(QT_MACEXTRAS_LIB 1) endif() if(Qt5WinExtras_FOUND) @@ -1238,7 +1238,7 @@ elseif(QT4_FOUND) message(STATUS "QtMultimedia includes: ${QT_INCLUDE_DIR}") set (QT_LIBRARIES ${QT_LIBRARIES} ${QT_QTMULTIMEDIA_LIBRARY}) message(STATUS "QtMultimedia libs: ${QT_QTMULTIMEDIA_LIBRARY}") - # That's the name autofoo uses + # That's the name autotools used set(QT_MULTIMEDIA_LIB 1) endif() if(WIN32 OR APPLE) diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake index c963e19ae0..5bcf96cd20 100644 --- a/cmake/modules/FindPCAP.cmake +++ b/cmake/modules/FindPCAP.cmake @@ -77,7 +77,7 @@ if( PCAP_FOUND ) check_function_exists( "pcap_freecode" HAVE_PCAP_FREECODE ) # # Note: for pcap_breakloop() and pcap_findalldevs(), the autoconf script - # checks for more than just whether the function exists, it also checks + # checked for more than just whether the function exists, it also checked # for whether pcap.h declares it; macOS software/security updates can # update libpcap without updating the headers. # |