From ad54042c8eef238b3365f260ba53655f680cfad5 Mon Sep 17 00:00:00 2001 From: houzh Date: Wed, 6 Sep 2023 18:29:48 +0800 Subject: [PATCH] fix modules/xxx.cmake --- cmake/modules/FindBZip2.cmake | 2 +- cmake/modules/FindBrotli.cmake | 2 +- cmake/modules/FindDirectFB.cmake | 2 +- cmake/modules/FindEXPAT.cmake | 2 +- cmake/modules/FindFribidi.cmake | 2 +- cmake/modules/FindGTEST.cmake | 2 +- cmake/modules/FindHV.cmake | 2 +- cmake/modules/FindJPEG.cmake | 2 +- cmake/modules/FindJSONCPP.cmake | 2 +- cmake/modules/FindLiteHtml.cmake | 2 +- cmake/modules/FindMBEDTLS.cmake | 2 +- cmake/modules/FindPLPLOT.cmake | 2 +- cmake/modules/FindPNG.cmake | 2 +- cmake/modules/FindPixman.cmake | 2 +- cmake/modules/FindSDL2.cmake | 2 +- cmake/modules/FindTurboJPEG.cmake | 2 +- cmake/modules/FindUniBreak.cmake | 2 +- cmake/modules/FindZIP.cmake | 2 +- cmake/modules/FindZLIB.cmake | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cmake/modules/FindBZip2.cmake b/cmake/modules/FindBZip2.cmake index 257460b6..fe7b26ce 100755 --- a/cmake/modules/FindBZip2.cmake +++ b/cmake/modules/FindBZip2.cmake @@ -21,7 +21,7 @@ if(BZIP2_INCLUDE_DIRS AND BZIP2_LIBRARIES) endif() include(FindPackageHandleStandardArgs) -#FIND_PACKAGE_HANDLE_STANDARD_ARGS(zlib REQUIRED_VARS BZIP2_INCLUDE_DIRS BZIP2_LIBRARIES +#FIND_PACKAGE_HANDLE_STANDARD_ARGS(BZip2 REQUIRED_VARS BZIP2_INCLUDE_DIRS BZIP2_LIBRARIES # FOUND_VAR BZIP2_FOUND VERSION_VAR BZIP2_VERSION) mark_as_advanced(BZIP2_LIBRARIES BZIP2_LIBRARY BZIP2_INCLUDE_DIRS BZIP2_INCLUDE_DIR BZIP2_FOUND BZIP2_VERSION) diff --git a/cmake/modules/FindBrotli.cmake b/cmake/modules/FindBrotli.cmake index abcdf174..29f942c9 100755 --- a/cmake/modules/FindBrotli.cmake +++ b/cmake/modules/FindBrotli.cmake @@ -47,7 +47,7 @@ if(BROTLIENC_INCLUDE_DIRS AND BROTLIDENC_LIBRARIES) set(BROTLIENC_VERSION ${PC_BROTLIENC_VERSION}) mark_as_advanced(BROTLIENC_LIBRARIES BROTLIENC_LIBRARY BROTLIENC_INCLUDE_DIRS BROTLIENC_INCLUDE_DIR BROTLIENC_FOUND BROTLIENC_VERSION) endif() -#FIND_PACKAGE_HANDLE_STANDARD_ARGS(zlib REQUIRED_VARS BROTLI_INCLUDE_DIRS BROTLI_LIBRARIES +#FIND_PACKAGE_HANDLE_STANDARD_ARGS(Brotli REQUIRED_VARS BROTLI_INCLUDE_DIRS BROTLI_LIBRARIES # FOUND_VAR BROTLI_FOUND VERSION_VAR BROTLI_VERSION) diff --git a/cmake/modules/FindDirectFB.cmake b/cmake/modules/FindDirectFB.cmake index 2a7275d5..b488336c 100755 --- a/cmake/modules/FindDirectFB.cmake +++ b/cmake/modules/FindDirectFB.cmake @@ -39,7 +39,7 @@ if(DIRECTFB_INCLUDE_DIRS AND DIRECTFB_LIBRARIES) endif() include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(directfb REQUIRED_VARS DIRECTFB_INCLUDE_DIRS DIRECTFB_LIBRARIES +FIND_PACKAGE_HANDLE_STANDARD_ARGS(DirectFB REQUIRED_VARS DIRECTFB_INCLUDE_DIRS DIRECTFB_LIBRARIES FOUND_VAR DIRECTFB_FOUND VERSION_VAR DIRECTFB_VERSION) mark_as_advanced(DIRECTFB_LIBRARIES DIRECTFB_LIBRARY DIRECTFB_INCLUDE_DIRS DIRECTFB_INCLUDE_DIR DIRECTFB_FOUND) diff --git a/cmake/modules/FindEXPAT.cmake b/cmake/modules/FindEXPAT.cmake index 1b362d52..f85afca2 100755 --- a/cmake/modules/FindEXPAT.cmake +++ b/cmake/modules/FindEXPAT.cmake @@ -20,7 +20,7 @@ if(EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY) set(EXPAT_LIBRARIES ${EXPAT_LIBRARY}) set(EXPAT_VERSION ${PC_EXPAT_VERSION}) include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(expat FOUND_VAR EXPAT_FOUND VERSION_VAR EXPAT_VERSION + FIND_PACKAGE_HANDLE_STANDARD_ARGS(EXPAT FOUND_VAR EXPAT_FOUND VERSION_VAR EXPAT_VERSION REQUIRED_VARS EXPAT_LIBRARIES EXPAT_LIBRARY EXPAT_INCLUDE_DIRS EXPAT_INCLUDE_DIR) mark_as_advanced(EXPAT_LIBRARIES EXPAT_LIBRARY EXPAT_INCLUDE_DIRS EXPAT_INCLUDE_DIR) endif() diff --git a/cmake/modules/FindFribidi.cmake b/cmake/modules/FindFribidi.cmake index 6729fa32..426fcd2b 100755 --- a/cmake/modules/FindFribidi.cmake +++ b/cmake/modules/FindFribidi.cmake @@ -22,7 +22,7 @@ if(FRIBIDI_INCLUDE_DIRS AND FRIBIDI_LIBRARIES) endif() include(FindPackageHandleStandardArgs) -#FIND_PACKAGE_HANDLE_STANDARD_ARGS(zlib REQUIRED_VARS FRIBIDI_INCLUDE_DIRS FRIBIDI_LIBRARIES +#FIND_PACKAGE_HANDLE_STANDARD_ARGS(Fribidi REQUIRED_VARS FRIBIDI_INCLUDE_DIRS FRIBIDI_LIBRARIES # FOUND_VAR FRIBIDI_FOUND VERSION_VAR FRIBIDI_VERSION) mark_as_advanced(FRIBIDI_LIBRARIES FRIBIDI_LIBRARY FRIBIDI_INCLUDE_DIRS FRIBIDI_INCLUDE_DIR FRIBIDI_FOUND) diff --git a/cmake/modules/FindGTEST.cmake b/cmake/modules/FindGTEST.cmake index e841222c..e1bd6b18 100755 --- a/cmake/modules/FindGTEST.cmake +++ b/cmake/modules/FindGTEST.cmake @@ -21,7 +21,7 @@ if(GTEST_INCLUDE_DIRS AND GTEST_LIBRARIES) endif() include(FindPackageHandleStandardArgs) -#FIND_PACKAGE_HANDLE_STANDARD_ARGS(zlib REQUIRED_VARS GTEST_INCLUDE_DIRS GTEST_LIBRARIES +#FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTEST REQUIRED_VARS GTEST_INCLUDE_DIRS GTEST_LIBRARIES # FOUND_VAR GTEST_FOUND VERSION_VAR GTEST_VERSION) mark_as_advanced(GTEST_LIBRARIES GTEST_LIBRARY GTEST_INCLUDE_DIRS GTEST_INCLUDE_DIR GTEST_FOUND GTEST_VERSION) diff --git a/cmake/modules/FindHV.cmake b/cmake/modules/FindHV.cmake index 52cdcc94..96fed22c 100755 --- a/cmake/modules/FindHV.cmake +++ b/cmake/modules/FindHV.cmake @@ -28,7 +28,7 @@ if(HV_INCLUDE_DIR AND HV_LIBRARY) set(HV_LIBRARIES ${HV_LIBRARY}) set(HV_VERSION ${PC_HV_VERSION}) include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(hv FOUND_VAR HV_FOUND VERSION_VAR HV_VERSION + FIND_PACKAGE_HANDLE_STANDARD_ARGS(HV FOUND_VAR HV_FOUND VERSION_VAR HV_VERSION REQUIRED_VARS HV_LIBRARIES HV_LIBRARY HV_INCLUDE_DIRS HV_INCLUDE_DIR) mark_as_advanced(HV_LIBRARIES HV_LIBRARY HV_INCLUDE_DIRS HV_INCLUDE_DIR) endif() diff --git a/cmake/modules/FindJPEG.cmake b/cmake/modules/FindJPEG.cmake index 3f9f3e70..2f5902a2 100755 --- a/cmake/modules/FindJPEG.cmake +++ b/cmake/modules/FindJPEG.cmake @@ -22,7 +22,7 @@ endif() #message("JPEG_LIBRARIES=${JPEG_LIBRARIES} JPEG_FOUND=${JPEG_FOUND}") include(FindPackageHandleStandardArgs) -#FIND_PACKAGE_HANDLE_STANDARD_ARGS(zlib REQUIRED_VARS JPEG_INCLUDE_DIRS JPEG_LIBRARIES +#FIND_PACKAGE_HANDLE_STANDARD_ARGS(JPEG REQUIRED_VARS JPEG_INCLUDE_DIRS JPEG_LIBRARIES # FOUND_VAR JPEG_FOUND VERSION_VAR JPEG_VERSION) mark_as_advanced(JPEG_LIBRARIES JPEG_LIBRARY JPEG_INCLUDE_DIRS JPEG_INCLUDE_DIR JPEG_FOUND) diff --git a/cmake/modules/FindJSONCPP.cmake b/cmake/modules/FindJSONCPP.cmake index 6d5e9b87..20f03dd5 100755 --- a/cmake/modules/FindJSONCPP.cmake +++ b/cmake/modules/FindJSONCPP.cmake @@ -22,7 +22,7 @@ if(JSONCPP_INCLUDE_DIRS AND JSONCPP_LIBRARIES) endif() include(FindPackageHandleStandardArgs) -#FIND_PACKAGE_HANDLE_STANDARD_ARGS(zlib REQUIRED_VARS JSONCPP_INCLUDE_DIRS JSONCPP_LIBRARIES +#FIND_PACKAGE_HANDLE_STANDARD_ARGS(JSONCPP REQUIRED_VARS JSONCPP_INCLUDE_DIRS JSONCPP_LIBRARIES # FOUND_VAR JSONCPP_FOUND VERSION_VAR JSONCPP_VERSION) mark_as_advanced(JSONCPP_LIBRARIES JSONCPP_LIBRARY JSONCPP_INCLUDE_DIRS JSONCPP_INCLUDE_DIR JSONCPP_FOUND) diff --git a/cmake/modules/FindLiteHtml.cmake b/cmake/modules/FindLiteHtml.cmake index 3b3f7cd9..1985a264 100755 --- a/cmake/modules/FindLiteHtml.cmake +++ b/cmake/modules/FindLiteHtml.cmake @@ -22,7 +22,7 @@ if(LITEHTML_INCLUDE_DIRS AND LITEHTML_LIBRARIES) endif() include(FindPackageHandleStandardArgs) -#FIND_PACKAGE_HANDLE_STANDARD_ARGS(zlib REQUIRED_VARS LITEHTML_INCLUDE_DIRS LITEHTML_LIBRARIES +#FIND_PACKAGE_HANDLE_STANDARD_ARGS(LiteHtml REQUIRED_VARS LITEHTML_INCLUDE_DIRS LITEHTML_LIBRARIES # FOUND_VAR LITEHTML_FOUND VERSION_VAR LITEHTML_VERSION) mark_as_advanced(LITEHTML_LIBRARIES LITEHTML_LIBRARY LITEHTML_INCLUDE_DIRS LITEHTML_INCLUDE_DIR LITEHTML_FOUND) diff --git a/cmake/modules/FindMBEDTLS.cmake b/cmake/modules/FindMBEDTLS.cmake index 67aa857d..70eae5bb 100755 --- a/cmake/modules/FindMBEDTLS.cmake +++ b/cmake/modules/FindMBEDTLS.cmake @@ -32,7 +32,7 @@ if(MBEDTLS_INCLUDE_DIR AND MBTLS_LIBRARY) set(MBEDTLS_LIBRARIES ${MBEDTLS_LIBRARY}) set(MBEDTLS_VERSION ${PC_MBEDTLS_VERSION}) include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(mbedtls FOUND_VAR MBEDTLS_FOUND VERSION_VAR MBEDTLS_VERSION + FIND_PACKAGE_HANDLE_STANDARD_ARGS(MBEDTLS FOUND_VAR MBEDTLS_FOUND VERSION_VAR MBEDTLS_VERSION REQUIRED_VARS MBEDTLS_LIBRARIES MBEDTLS_LIBRARY MBEDTLS_INCLUDE_DIRS MBEDTLS_INCLUDE_DIR) mark_as_advanced(MBEDTLS_LIBRARIES MBEDTLS_LIBRARY MBEDTLS_INCLUDE_DIRS MBEDTLS_INCLUDE_DIR) endif() diff --git a/cmake/modules/FindPLPLOT.cmake b/cmake/modules/FindPLPLOT.cmake index 5c0abcec..8bbd0f16 100755 --- a/cmake/modules/FindPLPLOT.cmake +++ b/cmake/modules/FindPLPLOT.cmake @@ -24,7 +24,7 @@ if(PLPLOT_INCLUDE_DIRS AND PLPLOT_LIBRARIES) endif() include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(plplot REQUIRED_VARS PLPLOT_INCLUDE_DIRS PLPLOT_LIBRARIES +FIND_PACKAGE_HANDLE_STANDARD_ARGS(PLPLOT REQUIRED_VARS PLPLOT_INCLUDE_DIRS PLPLOT_LIBRARIES FOUND_VAR PLPLOT_FOUND VERSION_VAR PLPLOT_VERSION) mark_as_advanced(PLPLOT_LIBRARIES PLPLOT_LIBRARY PLPLOT_INCLUDE_DIRS PLPLOT_INCLUDE_DIR PLPLOT_FOUND) diff --git a/cmake/modules/FindPNG.cmake b/cmake/modules/FindPNG.cmake index aefbd588..8e2da8a9 100755 --- a/cmake/modules/FindPNG.cmake +++ b/cmake/modules/FindPNG.cmake @@ -19,7 +19,7 @@ if(PNG_INCLUDE_DIRS AND PNG_LIBRARIES) set(PNG_INCLUDE_DIR ${PNG_INCLUDE_DIRS}) set(PNG_VERSION ${PC_PNG_VERSION}) include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(png FOUND_VAR PNG_FOUND VERSION_VAR PNG_VERSION + FIND_PACKAGE_HANDLE_STANDARD_ARGS(PNG FOUND_VAR PNG_FOUND VERSION_VAR PNG_VERSION REQUIRED_VARS PNG_INCLUDE_DIRS PNG_INCLUDE_DIR PNG_LIBRARIES PNG_LIBRARY) mark_as_advanced(PNG_LIBRARIES PNG_LIBRARY PNG_INCLUDE_DIRS PNG_INCLUDE_DIR PNG_VERSION) diff --git a/cmake/modules/FindPixman.cmake b/cmake/modules/FindPixman.cmake index 648fe0a3..6d9e8b26 100755 --- a/cmake/modules/FindPixman.cmake +++ b/cmake/modules/FindPixman.cmake @@ -22,7 +22,7 @@ if(PIXMAN_INCLUDE_DIRS AND PIXMAN_LIBRARIES) endif() include(FindPackageHandleStandardArgs) -#FIND_PACKAGE_HANDLE_STANDARD_ARGS(zlib REQUIRED_VARS PIXMAN_INCLUDE_DIRS PIXMAN_LIBRARIES +#FIND_PACKAGE_HANDLE_STANDARD_ARGS(Pixman REQUIRED_VARS PIXMAN_INCLUDE_DIRS PIXMAN_LIBRARIES # FOUND_VAR PIXMAN_FOUND VERSION_VAR PIXMAN_VERSION) mark_as_advanced(PIXMAN_LIBRARIES PIXMAN_LIBRARY PIXMAN_INCLUDE_DIRS PIXMAN_INCLUDE_DIR PIXMAN_FOUND) diff --git a/cmake/modules/FindSDL2.cmake b/cmake/modules/FindSDL2.cmake index dffa01d9..a2250458 100755 --- a/cmake/modules/FindSDL2.cmake +++ b/cmake/modules/FindSDL2.cmake @@ -18,7 +18,7 @@ if(SDL2_INCLUDE_DIRS AND SDL2_LIBRARIES) set(SDL2_INCLUDE_DIR ${SDL2_INCLUDE_DIRS}) set(SDL2_VERSION ${PC_SDL_VERSION}) include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(sdl2 FOUND_VAR SDL2_FOUND VERSION_VAR SDL2_VERSION + FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 FOUND_VAR SDL2_FOUND VERSION_VAR SDL2_VERSION REQUIRED_VARS SDL2_INCLUDE_DIRS SDL2_INCLUDE_DIR SDL2_LIBRARIES SDL2_LIBRARY) mark_as_advanced(SDL2_LIBRARIES SDL2_LIBRARY SDL2_INCLUDE_DIRS SDL2_INCLUDE_DIR SDL2_VERSION) diff --git a/cmake/modules/FindTurboJPEG.cmake b/cmake/modules/FindTurboJPEG.cmake index a4eeadc0..433f8dd8 100755 --- a/cmake/modules/FindTurboJPEG.cmake +++ b/cmake/modules/FindTurboJPEG.cmake @@ -21,7 +21,7 @@ if(TURBOJPEG_INCLUDE_DIRS AND TURBOJPEG_LIBRARIES) endif() include(FindPackageHandleStandardArgs) -#FIND_PACKAGE_HANDLE_STANDARD_ARGS(zlib REQUIRED_VARS TURBOJPEG_INCLUDE_DIRS TURBOJPEG_LIBRARIES +#FIND_PACKAGE_HANDLE_STANDARD_ARGS(TurboJPEG REQUIRED_VARS TURBOJPEG_INCLUDE_DIRS TURBOJPEG_LIBRARIES # FOUND_VAR TURBOJPEG_FOUND VERSION_VAR TURBOJPEG_VERSION) mark_as_advanced(TURBOJPEG_LIBRARIES TURBOJPEG_LIBRARY TURBOJPEG_INCLUDE_DIRS TURBOJPEG_INCLUDE_DIR TURBOJPEG_FOUND) diff --git a/cmake/modules/FindUniBreak.cmake b/cmake/modules/FindUniBreak.cmake index 89afef33..9134387a 100755 --- a/cmake/modules/FindUniBreak.cmake +++ b/cmake/modules/FindUniBreak.cmake @@ -22,7 +22,7 @@ if(UNIBREAK_INCLUDE_DIRS AND UNIBREAK_LIBRARIES) endif() include(FindPackageHandleStandardArgs) -#FIND_PACKAGE_HANDLE_STANDARD_ARGS(zlib REQUIRED_VARS UNIBREAK_INCLUDE_DIRS UNIBREAK_LIBRARIES +#FIND_PACKAGE_HANDLE_STANDARD_ARGS(UniBreak REQUIRED_VARS UNIBREAK_INCLUDE_DIRS UNIBREAK_LIBRARIES # FOUND_VAR UNIBREAK_FOUND VERSION_VAR UNIBREAK_VERSION) mark_as_advanced(UNIBREAK_LIBRARIES UNIBREAK_LIBRARY UNIBREAK_INCLUDE_DIRS UNIBREAK_INCLUDE_DIR UNIBREAK_FOUND UNIBREAK_VERSION) diff --git a/cmake/modules/FindZIP.cmake b/cmake/modules/FindZIP.cmake index b99e914f..c7600bac 100755 --- a/cmake/modules/FindZIP.cmake +++ b/cmake/modules/FindZIP.cmake @@ -22,7 +22,7 @@ if(ZIP_INCLUDE_DIRS AND ZIP_LIBRARIES) endif() include(FindPackageHandleStandardArgs) -#FIND_PACKAGE_HANDLE_STANDARD_ARGS(zlib REQUIRED_VARS ZIP_INCLUDE_DIRS ZIP_LIBRARIES +#FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZIP REQUIRED_VARS ZIP_INCLUDE_DIRS ZIP_LIBRARIES # FOUND_VAR ZIP_FOUND VERSION_VAR ZIP_VERSION) mark_as_advanced(ZIP_LIBRARIES ZIP_LIBRARY ZIP_INCLUDE_DIRS ZIP_INCLUDE_DIR ZIP_FOUND) diff --git a/cmake/modules/FindZLIB.cmake b/cmake/modules/FindZLIB.cmake index ed5e59a3..9258e46c 100755 --- a/cmake/modules/FindZLIB.cmake +++ b/cmake/modules/FindZLIB.cmake @@ -22,7 +22,7 @@ if(ZLIB_INCLUDE_DIRS AND ZLIB_LIBRARIES) endif() include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(zlib FOUND_VAR ZLIB_FOUND VERSION_VAR ZLIB_VERSION +FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB FOUND_VAR ZLIB_FOUND VERSION_VAR ZLIB_VERSION REQUIRED_VARS ZLIB_INCLUDE_DIRS ZLIB_INCLUDE_DIR ZLIB_LIBRARIES ZLIB_LIBRARY) mark_as_advanced(ZLIB_LIBRARIES ZLIB_LIBRARY ZLIB_INCLUDE_DIRS ZLIB_INCLUDE_DIR ZLIB_FOUND ZLIB_VERSION)