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

CMake: fix some warnings reported by CMake 3.17 

Newer version of CMake complains with warnings like the one below:

The package name passed to `find_package_handle_standard_args` (MINIZIP)
does not match the name of the calling package (Minizip).  This can lead to
problems in calling code that expects `find_package` result variables
(e.g., `_FOUND`) to follow a certain pattern.

Change the capitalization of the variables to match the filename.

Change-Id: Ic3c88f33f5a2bfeba3fa3479df60210e67d25ff0
Reviewed-on: https://code.wireshark.org/review/36695
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Pascal Quantin 2020-04-04 16:15:42 +02:00 committed by Anders Broman
parent 8bf6c7b3bf
commit f48a62f4ef
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/modules/FindAsciidoctor.cmake
View File

@ -174,7 +174,7 @@ if(ASCIIDOCTOR_EXECUTABLE)
endif(ASCIIDOCTOR_EXECUTABLE)
include( FindPackageHandleStandardArgs )
find_package_handle_standard_args( ASCIIDOCTOR
find_package_handle_standard_args( Asciidoctor
REQUIRED_VARS ASCIIDOCTOR_EXECUTABLE
VERSION_VAR ASCIIDOCTOR_VERSION
)

2
cmake/modules/FindBCG729.cmake
View File

@ -31,7 +31,7 @@ find_library( BCG729_LIBRARY
)
include( FindPackageHandleStandardArgs )
find_package_handle_standard_args( bcg729 DEFAULT_MSG BCG729_LIBRARY BCG729_INCLUDE_DIR )
find_package_handle_standard_args( BCG729 DEFAULT_MSG BCG729_LIBRARY BCG729_INCLUDE_DIR )
if( BCG729_FOUND )
set( BCG729_INCLUDE_DIRS ${BCG729_INCLUDE_DIR} )

2
cmake/modules/FindILBC.cmake
View File

@ -51,7 +51,7 @@ if(ILBC_INCLUDE_DIR AND ILBC_LIBRARY)
endif()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(iLBC DEFAULT_MSG ILBC_LIBRARY ILBC_INCLUDE_DIR)
find_package_handle_standard_args(ILBC DEFAULT_MSG ILBC_LIBRARY ILBC_INCLUDE_DIR)
if( ILBC_FOUND )
set( ILBC_INCLUDE_DIRS ${ILBC_INCLUDE_DIR} )

2
cmake/modules/FindMinizip.cmake
View File

@ -35,7 +35,7 @@ find_library(MINIZIP_LIBRARY
)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(MINIZIP
find_package_handle_standard_args(Minizip
REQUIRED_VARS MINIZIP_LIBRARY MINIZIP_INCLUDE_DIR
VERSION_VAR MINIZIP_VERSION)

2
cmake/modules/FindNGHTTP2.cmake
View File

@ -31,7 +31,7 @@ find_library( NGHTTP2_LIBRARY
)
include( FindPackageHandleStandardArgs )
find_package_handle_standard_args( Nghttp2 DEFAULT_MSG NGHTTP2_LIBRARY NGHTTP2_INCLUDE_DIR )
find_package_handle_standard_args( NGHTTP2 DEFAULT_MSG NGHTTP2_LIBRARY NGHTTP2_INCLUDE_DIR )
if( NGHTTP2_FOUND )
set( NGHTTP2_INCLUDE_DIRS ${NGHTTP2_INCLUDE_DIR} )

2
cmake/modules/FindSPANDSP.cmake
View File

@ -31,7 +31,7 @@ find_library( SPANDSP_LIBRARY
)
include( FindPackageHandleStandardArgs )
find_package_handle_standard_args( SpanDSP DEFAULT_MSG SPANDSP_LIBRARY SPANDSP_INCLUDE_DIR )
find_package_handle_standard_args( SPANDSP DEFAULT_MSG SPANDSP_LIBRARY SPANDSP_INCLUDE_DIR )
if( SPANDSP_FOUND )
set( SPANDSP_INCLUDE_DIRS ${SPANDSP_INCLUDE_DIR} )

2
cmake/modules/FindSystemd.cmake
View File

@ -22,7 +22,7 @@ find_library(SYSTEMD_LIBRARY
)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(SYSTEMD
find_package_handle_standard_args(Systemd
REQUIRED_VARS SYSTEMD_LIBRARY SYSTEMD_INCLUDE_DIR
VERSION_VAR PC_SYSTEMD_VERSION)