~ricmm/media-hub/keep-display-recording-1362658

Viewing changes to src/core/media/CMakeLists.txt

Committer: CI bot
Author(s): thomas-voss
Date: 2014-09-10 21:10:26 UTC
mfrom: (56.3.7 complete-mpris-spec)
Revision ID: ps-jenkins@lists.canonical.com-20140910211026-kmj7hmib52dzj8s9

Get rid of custom macros and use the ones provided by dbus-cpp.
Adjust to changes due to making org.mpris.MediaPlayer2.Player compliant to the spec.
Approved by: Jim Hodapp, Nick Dedekind, PS Jenkins bot, Marcus Tomlinson

files added:
src/core/media/mpris/media_player2.h

files removed:
src/core/media/mpris/macros.h

files modified:
src/core/media/CMakeLists.txt

src/core/media/mpris/player.h

src/core/media/mpris/service.h

src/core/media/mpris/track_list.h

src/core/media/player_configuration.h

src/core/media/player_implementation.cpp

src/core/media/player_implementation.h

src/core/media/player_skeleton.cpp

src/core/media/player_skeleton.h

src/core/media/player_stub.cpp

src/core/media/player_stub.h

src/core/media/service_implementation.cpp

src/core/media/service_skeleton.cpp

src/core/media/service_stub.cpp

Show diffs side-by-side

added added

removed removed

src/core/media/CMakeLists.txt

pkg_check_modules(PC_GSTREAMER_1_0 REQUIRED gstreamer-1.0)

include_directories(${PC_GSTREAMER_1_0_INCLUDE_DIRS} ${HYBRIS_MEDIA_CFLAGS})

file(GLOB MPRIS_HEADERS mpris/ *.h)

add_library(

media-hub-common SHARED

add_library(

media-hub-service

${MPRIS_HEADERS}

engine.cpp

gstreamer/engine.cpp

Older »