From 3cb8aa05f8cee9e860cf83531682ff0ed4af6a4f Mon Sep 17 00:00:00 2001 From: manuel Date: Thu, 4 Mar 2021 23:36:40 +0100 Subject: sync with upstream --- cmake/modules/FindCCache.cmake | 4 ++-- cmake/modules/FindCdio.cmake | 12 ++++++++++-- cmake/modules/FindIso9660pp.cmake | 8 +++++--- cmake/modules/FindPulseAudio.cmake | 10 +++------- cmake/modules/FindPython.cmake | 4 ++-- cmake/modules/FindVAAPI.cmake | 4 ++-- cmake/modules/FindWaylandpp.cmake | 9 ++++++++- 7 files changed, 32 insertions(+), 19 deletions(-) (limited to 'cmake/modules') diff --git a/cmake/modules/FindCCache.cmake b/cmake/modules/FindCCache.cmake index a18d4e0..0f6463b 100644 --- a/cmake/modules/FindCCache.cmake +++ b/cmake/modules/FindCCache.cmake @@ -16,8 +16,8 @@ if(CCACHE_FOUND) set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "${CCACHE_PROGRAM}") - file(WRITE "${CMAKE_BINARY_DIR}/launch-c" "exec \"${CCACHE_PROGRAM}\" \"${CMAKE_C_COMPILER}\" \"$@\"\n") - file(WRITE "${CMAKE_BINARY_DIR}/launch-cxx" "exec \"${CCACHE_PROGRAM}\" \"${CMAKE_CXX_COMPILER}\" \"$@\"\n") + file(WRITE "${CMAKE_BINARY_DIR}/launch-c" "#!/bin/sh\nexec \"${CCACHE_PROGRAM}\" \"${CMAKE_C_COMPILER}\" \"$@\"\n") + file(WRITE "${CMAKE_BINARY_DIR}/launch-cxx" "#!/bin/sh\nexec \"${CCACHE_PROGRAM}\" \"${CMAKE_CXX_COMPILER}\" \"$@\"\n") execute_process(COMMAND chmod +x "${CMAKE_BINARY_DIR}/launch-c" "${CMAKE_BINARY_DIR}/launch-cxx") set(CMAKE_XCODE_ATTRIBUTE_CC "${CMAKE_BINARY_DIR}/launch-c" PARENT_SCOPE) diff --git a/cmake/modules/FindCdio.cmake b/cmake/modules/FindCdio.cmake index 465ecc6..3a10b06 100644 --- a/cmake/modules/FindCdio.cmake +++ b/cmake/modules/FindCdio.cmake @@ -11,6 +11,7 @@ if(PKG_CONFIG_FOUND) pkg_check_modules(PC_CDIO libcdio>=0.80 QUIET) + pkg_check_modules(PC_CDIOPP libcdio++>=2.1.0 QUIET) endif() find_path(CDIO_INCLUDE_DIR NAMES cdio/cdio.h @@ -19,7 +20,14 @@ find_path(CDIO_INCLUDE_DIR NAMES cdio/cdio.h find_library(CDIO_LIBRARY NAMES cdio libcdio PATHS ${PC_CDIO_LIBDIR}) -set(CDIO_VERSION ${PC_CDIO_VERSION}) +if(DEFINED PC_CDIO_VERSION AND DEFINED PC_CDIOPP_VERSION AND NOT "${PC_CDIO_VERSION}" VERSION_EQUAL "${PC_CDIOPP_VERSION}") + message(WARNING "Detected libcdio (${PC_CDIO_VERSION}) and libcdio++ (${PC_CDIOPP_VERSION}) version mismatch. libcdio++ will not be used.") +else() + find_path(CDIOPP_INCLUDE_DIR NAMES cdio++/cdio.hpp + PATHS ${PC_CDIOPP_INCLUDEDIR} ${CDIO_INCLUDE_DIR}) + + set(CDIO_VERSION ${PC_CDIO_VERSION}) +endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Cdio @@ -31,4 +39,4 @@ if(CDIO_FOUND) set(CDIO_INCLUDE_DIRS ${CDIO_INCLUDE_DIR}) endif() -mark_as_advanced(CDIO_INCLUDE_DIR CDIO_LIBRARY) +mark_as_advanced(CDIO_INCLUDE_DIR CDIOPP_INCLUDE_DIR CDIO_LIBRARY) diff --git a/cmake/modules/FindIso9660pp.cmake b/cmake/modules/FindIso9660pp.cmake index 5f84b55..f98273b 100644 --- a/cmake/modules/FindIso9660pp.cmake +++ b/cmake/modules/FindIso9660pp.cmake @@ -15,6 +15,8 @@ if(PKG_CONFIG_FOUND) pkg_check_modules(PC_ISO9660 libiso9660>=2.1.0 QUIET) endif() +find_package(Cdio) + find_path(ISO9660PP_INCLUDE_DIR NAMES cdio++/iso9660.hpp PATHS ${PC_ISO9660PP_INCLUDEDIR}) @@ -31,12 +33,12 @@ set(ISO9660PP_VERSION ${PC_ISO9660PP_VERSION}) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Iso9660pp - REQUIRED_VARS ISO9660PP_LIBRARY ISO9660PP_INCLUDE_DIR ISO9660_LIBRARY ISO9660_INCLUDE_DIR + REQUIRED_VARS ISO9660PP_LIBRARY ISO9660PP_INCLUDE_DIR ISO9660_LIBRARY ISO9660_INCLUDE_DIR CDIO_LIBRARY CDIO_INCLUDE_DIR CDIOPP_INCLUDE_DIR VERSION_VAR ISO9660PP_VERSION) if(ISO9660PP_FOUND) - set(ISO9660PP_LIBRARIES ${ISO9660PP_LIBRARY} ${ISO9660_LIBRARY}) - set(ISO9660PP_INCLUDE_DIRS ${ISO9660PP_INCLUDE_DIR} ${ISO9660_INCLUDE_DIR}) + set(ISO9660PP_LIBRARIES ${ISO9660PP_LIBRARY} ${ISO9660_LIBRARY} ${CDIO_LIBRARY}) + set(ISO9660PP_INCLUDE_DIRS ${CDIO_INCLUDE_DIR} ${CDIOPP_INCLUDE_DIR} ${ISO9660_INCLUDE_DIR} ${ISO9660PP_INCLUDE_DIR}) set(ISO9660PP_DEFINITIONS -DHAS_ISO9660PP=1) endif() diff --git a/cmake/modules/FindPulseAudio.cmake b/cmake/modules/FindPulseAudio.cmake index 2ef7910..829a2d8 100644 --- a/cmake/modules/FindPulseAudio.cmake +++ b/cmake/modules/FindPulseAudio.cmake @@ -14,14 +14,10 @@ # # PulseAudio::PulseAudio - The PulseAudio library -if(NOT PulseAudio_FIND_VERSION) - set(PulseAudio_FIND_VERSION 2.0.0) -endif() - if(PKG_CONFIG_FOUND) - pkg_check_modules(PC_PULSEAUDIO libpulse>=${PulseAudio_FIND_VERSION} QUIET) - pkg_check_modules(PC_PULSEAUDIO_MAINLOOP libpulse-mainloop-glib QUIET) - pkg_check_modules(PC_PULSEAUDIO_SIMPLE libpulse-simple QUIET) + pkg_check_modules(PC_PULSEAUDIO libpulse>=11.0.0 QUIET) + pkg_check_modules(PC_PULSEAUDIO_MAINLOOP libpulse-mainloop-glib>=11.0.0 QUIET) + pkg_check_modules(PC_PULSEAUDIO_SIMPLE libpulse-simple>=11.0.0 QUIET) endif() find_path(PULSEAUDIO_INCLUDE_DIR NAMES pulse/pulseaudio.h pulse/simple.h diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake index e39d4e5..7bbda13 100644 --- a/cmake/modules/FindPython.cmake +++ b/cmake/modules/FindPython.cmake @@ -10,8 +10,8 @@ if(PKG_CONFIG_FOUND) endif() find_program(PYTHON_EXECUTABLE python3 ONLY_CMAKE_FIND_ROOT_PATH) -find_library(PYTHON_LIBRARY NAMES python3.8 python3.7 python3.6 python3.5 PATHS ${PC_PYTHON_LIBDIR}) -find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} PATH_SUFFIXES python3.8 python3.7 python3.6 python3.5) +find_library(PYTHON_LIBRARY NAMES python3.9 python3.8 python3.7 python3.6 python3.5 PATHS ${PC_PYTHON_LIBDIR}) +find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} PATH_SUFFIXES python3.9 python3.8 python3.7 python3.6 python3.5) if(KODI_DEPENDSBUILD) find_library(FFI_LIBRARY ffi REQUIRED) diff --git a/cmake/modules/FindVAAPI.cmake b/cmake/modules/FindVAAPI.cmake index 2111e4f..f0a5d05 100644 --- a/cmake/modules/FindVAAPI.cmake +++ b/cmake/modules/FindVAAPI.cmake @@ -24,14 +24,14 @@ find_path(VAAPI_libva-drm_INCLUDE_DIR va/va_drm.h PATHS ${PC_VAAPI_libva-drm_INCLUDEDIR}) find_library(VAAPI_libva-drm_LIBRARY NAMES va-drm PATHS ${PC_VAAPI_libva-drm_LIBDIR}) -if(CORE_PLATFORM_NAME_LC STREQUAL "wayland") +if("wayland" IN_LIST CORE_PLATFORM_NAME_LC) find_path(VAAPI_libva-wayland_INCLUDE_DIR va/va_wayland.h PATHS ${PC_VAAPI_libva-wayland_INCLUDEDIR}) find_library(VAAPI_libva-wayland_LIBRARY NAMES va-wayland PATHS ${PC_VAAPI_libva-wayland_LIBDIR}) list(APPEND REQUIRED_VARS "VAAPI_libva-wayland_INCLUDE_DIR" "VAAPI_libva-wayland_LIBRARY") endif() -if(CORE_PLATFORM_NAME_LC STREQUAL "x11") +if("x11" IN_LIST CORE_PLATFORM_NAME_LC) find_path(VAAPI_libva-x11_INCLUDE_DIR va/va_x11.h PATHS ${PC_VAAPI_libva-x11_INCLUDEDIR}) find_library(VAAPI_libva-x11_LIBRARY NAMES va-x11 diff --git a/cmake/modules/FindWaylandpp.cmake b/cmake/modules/FindWaylandpp.cmake index 3cfc282..ba229d7 100644 --- a/cmake/modules/FindWaylandpp.cmake +++ b/cmake/modules/FindWaylandpp.cmake @@ -11,12 +11,19 @@ # WAYLANDPP_SCANNER - path to wayland-scanner++ pkg_check_modules(PC_WAYLANDPP wayland-client++ wayland-egl++ wayland-cursor++ QUIET) -pkg_check_modules(PC_WAYLANDPP_SCANNER wayland-scanner++ QUIET) + if(PC_WAYLANDPP_FOUND) pkg_get_variable(PC_WAYLANDPP_PKGDATADIR wayland-client++ pkgdatadir) +else() + message(SEND_ERROR "wayland-client++ not found via pkg-config") endif() + +pkg_check_modules(PC_WAYLANDPP_SCANNER wayland-scanner++ QUIET) + if(PC_WAYLANDPP_SCANNER_FOUND) pkg_get_variable(PC_WAYLANDPP_SCANNER wayland-scanner++ wayland_scannerpp) +else() + message(SEND_ERROR "wayland-scanner++ not found via pkg-config") endif() find_path(WAYLANDPP_INCLUDE_DIR wayland-client.hpp PATHS ${PC_WAYLANDPP_INCLUDEDIR}) -- cgit v1.2.3