mirror of
https://github.com/minetest/minetest.git
synced 2024-08-19 04:54:18 +02:00
cmake: Silence warnings. (#9750)
Fixes https://github.com/minetest/minetest/issues/9734
This commit is contained in:
parent
b9377f26a1
commit
a368e7e793
@ -55,10 +55,10 @@ endif(WIN32)
|
|||||||
|
|
||||||
|
|
||||||
include(FindPackageHandleStandardArgs)
|
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
|
# BSD variants require special linkage as they don't use glibc
|
||||||
if(${CMAKE_SYSTEM_NAME} MATCHES "BSD|DragonFly")
|
if(${CMAKE_SYSTEM_NAME} MATCHES "BSD|DragonFly")
|
||||||
set(GETTEXT_LIBRARY "intl")
|
set(GETTEXT_LIBRARY "intl")
|
||||||
|
@ -11,14 +11,14 @@ if(ENABLE_SYSTEM_JSONCPP)
|
|||||||
find_path(JSON_INCLUDE_DIR json/allocator.h PATH_SUFFIXES jsoncpp)
|
find_path(JSON_INCLUDE_DIR json/allocator.h PATH_SUFFIXES jsoncpp)
|
||||||
|
|
||||||
include(FindPackageHandleStandardArgs)
|
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.")
|
message(STATUS "Using system JSONCPP library.")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT JSONCPP_FOUND)
|
if(NOT JSON_FOUND)
|
||||||
message(STATUS "Using bundled JSONCPP library.")
|
message(STATUS "Using bundled JSONCPP library.")
|
||||||
set(JSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/jsoncpp)
|
set(JSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/jsoncpp)
|
||||||
set(JSON_LIBRARY jsoncpp)
|
set(JSON_LIBRARY jsoncpp)
|
||||||
|
@ -55,7 +55,7 @@ ENDIF()
|
|||||||
INCLUDE(FindPackageHandleStandardArgs)
|
INCLUDE(FindPackageHandleStandardArgs)
|
||||||
# handle the QUIETLY and REQUIRED arguments and set LUAJIT_FOUND to TRUE if
|
# handle the QUIETLY and REQUIRED arguments and set LUAJIT_FOUND to TRUE if
|
||||||
# all listed variables are TRUE
|
# all listed variables are TRUE
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJit
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJIT
|
||||||
REQUIRED_VARS LUA_LIBRARY LUA_INCLUDE_DIR
|
REQUIRED_VARS LUA_LIBRARY LUA_INCLUDE_DIR
|
||||||
VERSION_VAR LUA_VERSION_STRING)
|
VERSION_VAR LUA_VERSION_STRING)
|
||||||
|
|
||||||
|
@ -20,13 +20,13 @@ if(NOT GP2XWIZ)
|
|||||||
# Handle the QUIETLY and REQUIRED arguments and set VORBIS_FOUND
|
# Handle the QUIETLY and REQUIRED arguments and set VORBIS_FOUND
|
||||||
# to TRUE if all listed variables are TRUE.
|
# to TRUE if all listed variables are TRUE.
|
||||||
include(FindPackageHandleStandardArgs)
|
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_INCLUDE_DIR VORBIS_INCLUDE_DIR
|
||||||
OGG_LIBRARY VORBIS_LIBRARY VORBISFILE_LIBRARY)
|
OGG_LIBRARY VORBIS_LIBRARY VORBISFILE_LIBRARY)
|
||||||
else(NOT GP2XWIZ)
|
else(NOT GP2XWIZ)
|
||||||
find_path(VORBIS_INCLUDE_DIR tremor/ivorbisfile.h)
|
find_path(VORBIS_INCLUDE_DIR tremor/ivorbisfile.h)
|
||||||
find_library(VORBIS_LIBRARY NAMES vorbis_dec)
|
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)
|
VORBIS_INCLUDE_DIR VORBIS_LIBRARY)
|
||||||
endif(NOT GP2XWIZ)
|
endif(NOT GP2XWIZ)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user