cmake: Silence warnings. (#9750)

Fixes https://github.com/minetest/minetest/issues/9734

diff --git a/cmake/Modules/FindGettextLib.cmake b/cmake/Modules/FindGettextLib.cmake
index 11de121770684973734e35babc2b017816854861..529452a4a342823dba5f181d2a6e3eae00921b65 100644 (file)
--- a/cmake/Modules/FindGettextLib.cmake
+++ b/cmake/Modules/FindGettextLib.cmake
@@ -55,10 +55,10 @@ endif(WIN32)
 
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(GetText DEFAULT_MSG ${GETTEXT_REQUIRED_VARS})
+find_package_handle_standard_args(GettextLib DEFAULT_MSG ${GETTEXT_REQUIRED_VARS})
 
 
-if(GETTEXT_FOUND)
+if(GETTEXTLIB_FOUND)
        # BSD variants require special linkage as they don't use glibc
        if(${CMAKE_SYSTEM_NAME} MATCHES "BSD|DragonFly")
                set(GETTEXT_LIBRARY "intl")

diff --git a/cmake/Modules/FindJson.cmake b/cmake/Modules/FindJson.cmake
index 53ddf459953c588f5d95997a371f09be736e331d..a5e9098f80f87a72b40b46deef1ec2f893971c12 100644 (file)
--- a/cmake/Modules/FindJson.cmake
+++ b/cmake/Modules/FindJson.cmake
@@ -11,14 +11,14 @@ if(ENABLE_SYSTEM_JSONCPP)
        find_path(JSON_INCLUDE_DIR json/allocator.h PATH_SUFFIXES jsoncpp)
 
        include(FindPackageHandleStandardArgs)
-       find_package_handle_standard_args(JSONCPP DEFAULT_MSG JSON_LIBRARY JSON_INCLUDE_DIR)
+       find_package_handle_standard_args(Json DEFAULT_MSG JSON_LIBRARY JSON_INCLUDE_DIR)
 
-       if(JSONCPP_FOUND)
+       if(JSON_FOUND)
                message(STATUS "Using system JSONCPP library.")
        endif()
 endif()
 
-if(NOT JSONCPP_FOUND)
+if(NOT JSON_FOUND)
        message(STATUS "Using bundled JSONCPP library.")
        set(JSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/jsoncpp)
        set(JSON_LIBRARY jsoncpp)

diff --git a/cmake/Modules/FindLuaJIT.cmake b/cmake/Modules/FindLuaJIT.cmake
index 4bc88b6b19a835ad09a2a14fb16796d5073dec53..97b0b7c6469584236a7434c6103c1d9df9192615 100644 (file)
--- a/cmake/Modules/FindLuaJIT.cmake
+++ b/cmake/Modules/FindLuaJIT.cmake
@@ -55,7 +55,7 @@ ENDIF()
 INCLUDE(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set LUAJIT_FOUND to TRUE if
 # all listed variables are TRUE
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJit
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJIT
        REQUIRED_VARS LUA_LIBRARY LUA_INCLUDE_DIR
        VERSION_VAR LUA_VERSION_STRING)
 

diff --git a/cmake/Modules/FindVorbis.cmake b/cmake/Modules/FindVorbis.cmake
index 8f381369427ca3d7a211a9d7a525631eee3db76b..e5fe7f25e8765fe9388764ccc629556c0044771e 100644 (file)
--- a/cmake/Modules/FindVorbis.cmake
+++ b/cmake/Modules/FindVorbis.cmake
@@ -20,13 +20,13 @@ if(NOT GP2XWIZ)
     # Handle the QUIETLY and REQUIRED arguments and set VORBIS_FOUND
     # to TRUE if all listed variables are TRUE.
     include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(VORBIS DEFAULT_MSG
+    find_package_handle_standard_args(Vorbis DEFAULT_MSG
         OGG_INCLUDE_DIR VORBIS_INCLUDE_DIR
         OGG_LIBRARY VORBIS_LIBRARY VORBISFILE_LIBRARY)
 else(NOT GP2XWIZ)
     find_path(VORBIS_INCLUDE_DIR tremor/ivorbisfile.h)
     find_library(VORBIS_LIBRARY NAMES vorbis_dec)
-    find_package_handle_standard_args(VORBIS DEFAULT_MSG
+    find_package_handle_standard_args(Vorbis DEFAULT_MSG
         VORBIS_INCLUDE_DIR VORBIS_LIBRARY)
 endif(NOT GP2XWIZ)