diff options
| author | Pascal Quantin <pascal@wireshark.org> | 2020-04-04 16:15:42 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-04-05 07:56:57 +0000 |
| commit | f48a62f4ef94d1c908b0880d021566eec7f35190 (patch) | |
| tree | e56d676dffb59174d8d0f7752d5c7aabbb37d599 /cmake | |
| parent | 8bf6c7b3bf4e355f336f19ce9c8f76d79cc8876e (diff) | |
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>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindAsciidoctor.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/FindBCG729.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/FindILBC.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/FindMinizip.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/FindNGHTTP2.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/FindSPANDSP.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/FindSystemd.cmake | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/cmake/modules/FindAsciidoctor.cmake b/cmake/modules/FindAsciidoctor.cmake index 9cbab414cf..d3d72b5935 100644 --- a/cmake/modules/FindAsciidoctor.cmake +++ b/cmake/modules/FindAsciidoctor.cmake @@ -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 ) diff --git a/cmake/modules/FindBCG729.cmake b/cmake/modules/FindBCG729.cmake index 2630194f68..13d9640fbc 100644 --- a/cmake/modules/FindBCG729.cmake +++ b/cmake/modules/FindBCG729.cmake @@ -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} ) diff --git a/cmake/modules/FindILBC.cmake b/cmake/modules/FindILBC.cmake index 014698b5e7..b2c5155106 100644 --- a/cmake/modules/FindILBC.cmake +++ b/cmake/modules/FindILBC.cmake @@ -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} ) diff --git a/cmake/modules/FindMinizip.cmake b/cmake/modules/FindMinizip.cmake index 88dd349f82..2f81130069 100644 --- a/cmake/modules/FindMinizip.cmake +++ b/cmake/modules/FindMinizip.cmake @@ -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) diff --git a/cmake/modules/FindNGHTTP2.cmake b/cmake/modules/FindNGHTTP2.cmake index 8748210c43..8cd3ce274b 100644 --- a/cmake/modules/FindNGHTTP2.cmake +++ b/cmake/modules/FindNGHTTP2.cmake @@ -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} ) diff --git a/cmake/modules/FindSPANDSP.cmake b/cmake/modules/FindSPANDSP.cmake index 202271580c..70aafc1165 100644 --- a/cmake/modules/FindSPANDSP.cmake +++ b/cmake/modules/FindSPANDSP.cmake @@ -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} ) diff --git a/cmake/modules/FindSystemd.cmake b/cmake/modules/FindSystemd.cmake index 6162d0d605..2fa2724b78 100644 --- a/cmake/modules/FindSystemd.cmake +++ b/cmake/modules/FindSystemd.cmake @@ -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) |