ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake: Silence warnings.

This commit is contained in:
orbea 2020-09-08 20:24:34 -07:00
parent 67761c7d31
commit 2bfbc4d79f
11 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMake/FindBlueZ.cmake
View File

@ -6,7 +6,7 @@
# #
# vim: expandtab sw=4 ts=4 sts=4: # vim: expandtab sw=4 ts=4 sts=4:
include(FindPkgConfig) find_package(PkgConfig QUIET)
pkg_check_modules (BlueZ_PKG QUIET bluez) pkg_check_modules (BlueZ_PKG QUIET bluez)
find_path(BlueZ_INCLUDE_DIR NAMES bluetooth/bluetooth.h find_path(BlueZ_INCLUDE_DIR NAMES bluetooth/bluetooth.h

0
CMake/FindCubeb.cmake → CMake/FindCUBEB.cmake
View File

2
CMake/FindLibevdev.cmake → CMake/FindLIBEVDEV.cmake
View File

@ -27,7 +27,7 @@ set(LIBEVDEV_LIBRARIES ${LIBEVDEV_LIBRARY} )
set(LIBEVDEV_INCLUDE_DIRS ${LIBEVDEV_INCLUDE_DIR} ) set(LIBEVDEV_INCLUDE_DIRS ${LIBEVDEV_INCLUDE_DIR} )
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(libevdev DEFAULT_MSG find_package_handle_standard_args(LIBEVDEV DEFAULT_MSG
LIBEVDEV_LIBRARY LIBEVDEV_INCLUDE_DIR) LIBEVDEV_LIBRARY LIBEVDEV_INCLUDE_DIR)
mark_as_advanced(LIBEVDEV_INCLUDE_DIR LIBEVDEV_LIBRARY ) mark_as_advanced(LIBEVDEV_INCLUDE_DIR LIBEVDEV_LIBRARY )

0
CMake/FindLibudev.cmake → CMake/FindLIBUDEV.cmake
View File

0
CMake/FindMbedTLS.cmake → CMake/FindMBEDTLS.cmake
View File

0
CMake/FindMiniupnpc.cmake → CMake/FindMINIUPNPC.cmake
View File

2
CMake/FindPulseAudio.cmake
View File

@ -6,7 +6,7 @@
# #
# vim: expandtab sw=4 ts=4 sts=4: # vim: expandtab sw=4 ts=4 sts=4:
include(FindPkgConfig) find_package(PkgConfig QUIET)
pkg_check_modules (PulseAudio_PKG QUIET libpulse) pkg_check_modules (PulseAudio_PKG QUIET libpulse)
find_path(PulseAudio_INCLUDE_DIR NAMES pulse/pulseaudio.h find_path(PulseAudio_INCLUDE_DIR NAMES pulse/pulseaudio.h

3
CMake/FindLibsystemd.cmake → CMake/FindSYSTEMD.cmake
View File

@ -1,5 +1,6 @@
include(FindPkgConfig) find_package(PkgConfig QUIET)
pkg_check_modules(PC_SYSTEMD QUIET "libsystemd") pkg_check_modules(PC_SYSTEMD QUIET "libsystemd")
if (PC_SYSTEMD_FOUND) if (PC_SYSTEMD_FOUND)
add_definitions(${PC_SYSTEMD_CFLAGS} ${PC_SYSTEMD_CFLAGS_OTHER}) add_definitions(${PC_SYSTEMD_CFLAGS} ${PC_SYSTEMD_CFLAGS_OTHER})
endif(PC_SYSTEMD_FOUND) endif(PC_SYSTEMD_FOUND)

12
CMakeLists.txt
View File

@ -485,8 +485,8 @@ if(OPROFILING)
endif() endif()
if(ENABLE_EVDEV) if(ENABLE_EVDEV)
find_package(Libudev REQUIRED) find_package(LIBUDEV REQUIRED)
find_package(Libevdev REQUIRED) find_package(LIBEVDEV REQUIRED)
if(LIBUDEV_FOUND AND LIBEVDEV_FOUND) if(LIBUDEV_FOUND AND LIBEVDEV_FOUND)
message(STATUS "libevdev/libudev found, enabling evdev controller backend") message(STATUS "libevdev/libudev found, enabling evdev controller backend")
add_definitions(-DHAVE_LIBUDEV=1) add_definitions(-DHAVE_LIBUDEV=1)
@ -679,7 +679,7 @@ endif()
add_subdirectory(Externals/soundtouch) add_subdirectory(Externals/soundtouch)
include_directories(Externals/soundtouch) include_directories(Externals/soundtouch)
find_package(Cubeb) find_package(CUBEB)
if(CUBEB_FOUND) if(CUBEB_FOUND)
message(STATUS "Using the system cubeb") message(STATUS "Using the system cubeb")
else() else()
@ -721,7 +721,7 @@ endif()
if(USE_UPNP) if(USE_UPNP)
if(NOT APPLE) if(NOT APPLE)
find_package(Miniupnpc) find_package(MINIUPNPC)
endif() endif()
if(MINIUPNPC_FOUND AND MINIUPNPC_API_VERSION GREATER 8) if(MINIUPNPC_FOUND AND MINIUPNPC_API_VERSION GREATER 8)
message(STATUS "Using shared miniupnpc") message(STATUS "Using shared miniupnpc")
@ -734,7 +734,7 @@ if(USE_UPNP)
endif() endif()
if(NOT APPLE) if(NOT APPLE)
find_package(MbedTLS) find_package(MBEDTLS)
endif() endif()
if(MBEDTLS_FOUND) if(MBEDTLS_FOUND)
message(STATUS "Using shared mbed TLS") message(STATUS "Using shared mbed TLS")
@ -789,7 +789,7 @@ if(USE_DISCORD_PRESENCE)
include_directories(Externals/discord-rpc/include) include_directories(Externals/discord-rpc/include)
endif() endif()
find_package(Libsystemd) find_package(SYSTEMD)
if(SYSTEMD_FOUND) if(SYSTEMD_FOUND)
message(STATUS "libsystemd found, enabling traversal server watchdog support") message(STATUS "libsystemd found, enabling traversal server watchdog support")
add_definitions(-DHAVE_LIBSYSTEMD) add_definitions(-DHAVE_LIBSYSTEMD)

2
Source/Core/AudioCommon/CMakeLists.txt
View File

@ -49,7 +49,7 @@ if(ENABLE_PULSEAUDIO)
# PulseAudio ships with a PulseAudioConfig.cmake with no imported target # PulseAudio ships with a PulseAudioConfig.cmake with no imported target
# So we use our own FindPulseAudio instead with "MODULE" # So we use our own FindPulseAudio instead with "MODULE"
find_package(PulseAudio MODULE QUIET) find_package(PulseAudio MODULE QUIET)
if(PULSEAUDIO_FOUND) if(PulseAudio_FOUND)
message(STATUS "PulseAudio found, enabling PulseAudio sound backend") message(STATUS "PulseAudio found, enabling PulseAudio sound backend")
target_sources(audiocommon PRIVATE target_sources(audiocommon PRIVATE
PulseAudioStream.cpp PulseAudioStream.cpp

2
Source/Core/Core/CMakeLists.txt
View File

@ -635,7 +635,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
option(ENABLE_BLUEZ "Enables bluetooth support" ON) option(ENABLE_BLUEZ "Enables bluetooth support" ON)
if(ENABLE_BLUEZ) if(ENABLE_BLUEZ)
find_package(BlueZ) find_package(BlueZ)
if(BLUEZ_FOUND) if(BlueZ_FOUND)
message(STATUS "BlueZ found, enabling bluetooth support") message(STATUS "BlueZ found, enabling bluetooth support")
target_sources(core PRIVATE target_sources(core PRIVATE
HW/WiimoteReal/IOLinux.cpp HW/WiimoteReal/IOLinux.cpp