sync cmake buildsystem

FernetMenta · Dec 11, 2015 · 600656c · 600656c
1 parent 10f6ce6
commit 600656c
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 9 deletions.
diff --git a/project/cmake/modules/FindVAAPI.cmake b/project/cmake/modules/FindVAAPI.cmake
@@ -12,7 +12,7 @@
 find_path(VAAPI_INCLUDE_DIRS va/va.h)
 
 find_library(VA_LIBRARY
-             NAMES va)
+             NAMES va>=1.4.0)
 
 find_library(VAX11_LIBRARY
              NAMES va-x11)

diff --git a/project/cmake/treedata/common/interfaces.txt b/project/cmake/treedata/common/interfaces.txt
@@ -1,4 +1,5 @@
 xbmc/interfaces                 interfaces
+xbmc/interfaces/builtins        interfaces/builtins
 xbmc/interfaces/generic         interfaces/generic
 xbmc/interfaces/info            interfaces/info
 xbmc/interfaces/json-rpc        interfaces/json-rpc

diff --git a/xbmc/cores/VideoPlayer/CMakeLists.txt b/xbmc/cores/VideoPlayer/CMakeLists.txt
@@ -7,6 +7,7 @@ set(SOURCES DVDAudio.cpp
             DVDOverlayContainer.cpp
             VideoPlayerAudio.cpp
             VideoPlayer.cpp
+            VideoPlayerRadioRDS.cpp
             VideoPlayerSubtitle.cpp
             VideoPlayerTeletext.cpp
             VideoPlayerVideo.cpp

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/CMakeLists.txt b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/CMakeLists.txt
@@ -21,3 +21,4 @@ if(MMAL_FOUND)
 endif()
 
 core_add_library(videorenderers_hwdec)
+add_dependencies(videorenderers_hwdec ffmpeg)
diff --git a/xbmc/guilib/CMakeLists.txt b/xbmc/guilib/CMakeLists.txt
@@ -100,4 +100,4 @@ if(WIN32)
 endif()
 
 core_add_library(guilib)
-add_dependencies(guilib libcpluff)
+add_dependencies(guilib libcpluff ffmpeg)
diff --git a/xbmc/interfaces/CMakeLists.txt b/xbmc/interfaces/CMakeLists.txt
@@ -1,5 +1,4 @@
-set(SOURCES AnnouncementManager.cpp
-            Builtins.cpp)
+set(SOURCES AnnouncementManager.cpp)
 
 core_add_library(interfaces)
 add_dependencies(interfaces libcpluff)
diff --git a/xbmc/interfaces/builtins/CMakeLists.txt b/xbmc/interfaces/builtins/CMakeLists.txt
@@ -0,0 +1,19 @@
+set(SOURCES AddonBuiltins.cpp
+            ApplicationBuiltins.cpp
+            Builtins.cpp
+            CECBuiltins.cpp
+            GUIBuiltins.cpp
+            GUIControlBuiltins.cpp
+            GUIContainerBuiltins.cpp
+            LibraryBuiltins.cpp
+            OpticalBuiltins.cpp
+            PictureBuiltins.cpp
+            PlayerBuiltins.cpp
+            ProfileBuiltins.cpp
+            PVRBuiltins.cpp
+            SkinBuiltins.cpp
+            SystemBuiltins.cpp
+            WeatherBuiltins.cpp)
+
+core_add_library(interfaces_builtins)
+add_dependencies(interfaces_builtins libcpluff)
diff --git a/xbmc/interfaces/legacy/CMakeLists.txt b/xbmc/interfaces/legacy/CMakeLists.txt
@@ -8,6 +8,7 @@ set(SOURCES AddonCallback.cpp
             Dialog.cpp
             File.cpp
             InfoTagMusic.cpp
+            InfoTagRadioRDS.cpp
             InfoTagVideo.cpp
             Keyboard.cpp
             LanguageHook.cpp

diff --git a/xbmc/music/windows/CMakeLists.txt b/xbmc/music/windows/CMakeLists.txt
@@ -6,4 +6,4 @@ set(SOURCES GUIWindowMusicBase.cpp
             GUIWindowVisualisation.cpp)
 
 core_add_library(music_windows)
-add_dependencies(music_windows libcpluff)
+add_dependencies(music_windows libcpluff ffmpeg)
diff --git a/xbmc/pvr/channels/CMakeLists.txt b/xbmc/pvr/channels/CMakeLists.txt
@@ -2,7 +2,8 @@ set(SOURCES PVRChannel.cpp
             PVRChannelGroup.cpp
             PVRChannelGroupInternal.cpp
             PVRChannelGroups.cpp
-            PVRChannelGroupsContainer.cpp)
+            PVRChannelGroupsContainer.cpp
+            PVRRadioRDSInfoTag.cpp)
 
 core_add_library(pvr_channels)
 add_dependencies(pvr_channels libcpluff)
diff --git a/xbmc/pvr/dialogs/CMakeLists.txt b/xbmc/pvr/dialogs/CMakeLists.txt
@@ -4,6 +4,7 @@ set(SOURCES GUIDialogPVRChannelManager.cpp
             GUIDialogPVRGuideInfo.cpp
             GUIDialogPVRGuideOSD.cpp
             GUIDialogPVRGuideSearch.cpp
+            GUIDialogPVRRadioRDSInfo.cpp
             GUIDialogPVRRecordingInfo.cpp
             GUIDialogPVRTimerSettings.cpp)
 

diff --git a/xbmc/pvr/windows/CMakeLists.txt b/xbmc/pvr/windows/CMakeLists.txt
@@ -7,4 +7,4 @@ set(SOURCES GUIViewStatePVR.cpp
             GUIWindowPVRTimers.cpp)
 
 core_add_library(pvr_windows)
-add_dependencies(pvr_windows libcpluff)
+add_dependencies(pvr_windows libcpluff ffmpeg)
diff --git a/xbmc/settings/dialogs/CMakeLists.txt b/xbmc/settings/dialogs/CMakeLists.txt
@@ -6,4 +6,4 @@ set(SOURCES GUIDialogAudioDSPManager.cpp
             GUIDialogSettingsManualBase.cpp)
 
 core_add_library(settings_dialogs)
-add_dependencies(settings_dialogs libcpluff)
+add_dependencies(settings_dialogs libcpluff ffmpeg)
diff --git a/xbmc/windows/CMakeLists.txt b/xbmc/windows/CMakeLists.txt
@@ -12,4 +12,4 @@ set(SOURCES GUIMediaWindow.cpp
             GUIWindowWeather.cpp)
 
 core_add_library(windows)
-add_dependencies(windows libcpluff)
+add_dependencies(windows libcpluff ffmpeg)