From 1e5bdca69f7676b2dbcd64f0f44f31b12b337b7c Mon Sep 17 00:00:00 2001 From: manuel Date: Tue, 13 Dec 2016 13:45:04 +0100 Subject: sync with upstream --- project/cmake/CMakeLists.txt | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) (limited to 'project/cmake/CMakeLists.txt') diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt index fa1156d..c70b18d 100644 --- a/project/cmake/CMakeLists.txt +++ b/project/cmake/CMakeLists.txt @@ -45,14 +45,14 @@ option(ENABLE_NONFREE "Enable non-free components?" ON) option(ENABLE_AIRTUNES "Enable AirTunes support?" ON) option(ENABLE_CEC "Enable CEC support?" ON) option(ENABLE_OPTICAL "Enable optical support?" ON) +# use ffmpeg from depends or system +option(ENABLE_INTERNAL_FFMPEG "Enable internal ffmpeg?" OFF) if(UNIX) - if(NOT APPLE) - option(ENABLE_INTERNAL_FFMPEG "Enable internal ffmpeg?" ON) - endif() option(FFMPEG_PATH "Path to external ffmpeg?" "") option(ENABLE_INTERNAL_CROSSGUID "Enable internal crossguid?" ON) option(ENABLE_OPENSSL "Enable OpenSSL?" ON) option(ENABLE_SDL "Enable SDL?" OFF) + option(ENABLE_MIR "Enable MIR?" OFF) if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL freebsd) option(ENABLE_X11 "Enable X11 support?" ON) option(ENABLE_AML "Enable AML?" OFF) @@ -119,7 +119,7 @@ endif() # Optional dependencies set(optional_deps MicroHttpd MySqlClient SSH XSLT Alsa UDEV DBus Avahi SmbClient - PulseAudio VDPAU VAAPI) + PulseAudio VDPAU VAAPI Bluetooth CAP) # Required, dyloaded deps set(required_dyload Curl ASS) @@ -197,14 +197,24 @@ endif() if(NOT WIN32) core_optional_dep(OpenGl) if(OPENGL_FOUND) - core_optional_dep(X ENABLE_X11) - core_optional_dep(LibDRM ENABLE_X11) - core_optional_dep(XRandR ENABLE_X11) + if(ENABLE_MIR) + core_require_dep(Mir ENABLE_MIR) + core_optional_dep(LibDRM ENABLE_MIR) + else() + core_optional_dep(X ENABLE_X11) + core_optional_dep(XRandR ENABLE_X11) + core_optional_dep(LibDRM ENABLE_X11) + endif() else() core_optional_dep(OpenGLES) if(OPENGLES_FOUND) - core_optional_dep(X ENABLE_X11) - core_optional_dep(LibDRM ENABLE_X11) + if(ENABLE_MIR) + core_require_dep(Mir ENABLE_MIR) + core_optional_dep(LibDRM ENABLE_MIR) + else() + core_optional_dep(X ENABLE_X11) + core_optional_dep(LibDRM ENABLE_X11) + endif() endif() endif() if(NOT APPLE) @@ -337,9 +347,12 @@ unset(_MAIN_LIBRARIES) if(WIN32) set_target_properties(${APP_NAME_LC} PROPERTIES WIN32_EXECUTABLE ON) set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT ${APP_NAME_LC}) - target_sources(kodi PRIVATE ${CORE_SOURCE_DIR}/xbmc/platform/win32/app.manifest) + target_sources(${APP_NAME_LC} PRIVATE ${CORE_SOURCE_DIR}/xbmc/platform/win32/app.manifest) elseif(CORE_SYSTEM_NAME STREQUAL android) # Nothing +elseif(CORE_SYSTEM_NAME STREQUAL ios) + set_target_properties(${APP_NAME_LC} PROPERTIES OUTPUT_NAME ${APP_NAME} + MACOSX_BUNDLE_INFO_PLIST ${CORE_SOURCE_DIR}/xbmc/platform/darwin/ios/Info.plist.in) else() set_target_properties(${APP_NAME_LC} PROPERTIES SUFFIX ".bin") endif() -- cgit v1.2.3