Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

R3 #110

Closed
wants to merge 16 commits into from
Closed

R3 #110

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3ea90cf
Rollback the VC4 changes for RPI Implementation
sramani-metro Jun 2, 2021
88f1469
[SecurityAgent] Use RPC::CommunicatorClient to allow multiple connect…
May 26, 2021
6cf0466
Merge pull request #79 from sramani-metro/R3
pwielders Jun 21, 2021
1650b1e
Change type from BOOL to STRING for PLUGIN_COMPOSITOR_IMPLEMENTATION
404ag Jul 9, 2021
c9e8d3e
Use unified naming for gstreamerclient variables
404ag Jul 9, 2021
884214d
Merge pull request #86 from rdkcentral/development/backport-changes-f…
pwielders Jul 12, 2021
d3fce5d
Merge branch 'master' into R3
pwielders Jul 23, 2021
965bf94
Merge branch 'master' into R3
pwielders Aug 4, 2021
e254742
Merge branch 'master' of github.com:rdkcentral/ThunderClientLibraries…
bramoosterhuis Aug 9, 2021
d5ff126
Merge branch 'master' into R3
Divya-563 Sep 14, 2021
1424eae
Merge branch 'master' into R3
Divya-563 Jan 3, 2022
26a1a58
Merge branch 'master' into R3
Divya-563 Jan 5, 2022
1dde743
Merge branch 'master' into R3
Divya-563 Jan 7, 2022
7198418
Merge branch 'master' into R3
Divya-563 Jan 31, 2022
ee4800c
Merge branch 'master' into R3
Divya-563 Feb 7, 2022
32d02fb
Merge branch 'master' into R3
Divya-563 Mar 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/compositorclient/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ message("Setup ${TARGET} v${PROJECT_VERSION}")

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

option(PLUGIN_COMPOSITOR_IMPLEMENTATION "Defines which implementation is used." "None")
set(PLUGIN_COMPOSITOR_IMPLEMENTATION "None" CACHE STRING "Defines which implementation is used")

find_package(CompileSettingsDebug CONFIG REQUIRED)
find_package(${NAMESPACE}Core REQUIRED)
Expand Down
16 changes: 11 additions & 5 deletions Source/gstreamerclient/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,25 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

message("Setup ${TARGET} v${PROJECT_VERSION}")

option(GSTREAMER_CLIENT_IMPLEMENTATION "Defines which implementation is used." "None")
set(GSTREAMERCLIENT_IMPLEMENTATION "None" CACHE STRING "Defines which implementation is used.")

# Legacy option support
if(GSTREAMER_CLIENT_IMPLEMENTATION)
set(GSTREAMERCLIENT_IMPLEMENTATION "${GSTREAMER_CLIENT_IMPLEMENTATION}" CACHE STRING "Defines which implementation is used." FORCE)
unset(GSTREAMER_CLIENT_IMPLEMENTATION CACHE)
endif()

find_package(CompileSettingsDebug CONFIG REQUIRED)
find_package(${NAMESPACE}Core REQUIRED)
find_package(${NAMESPACE}COM REQUIRED)

if (NOT "${GSTREAMER_CLIENT_IMPLEMENTATION}" STREQUAL "None")
if (NOT "${GSTREAMERCLIENT_IMPLEMENTATION}" STREQUAL "None")

message("GstreamerClient impl. for ${GSTREAMER_CLIENT_IMPLEMENTATION}")
message("GstreamerClient impl. for ${GSTREAMERCLIENT_IMPLEMENTATION}")
find_package(GSTREAMER REQUIRED)
find_package(GSTREAMER_BASE REQUIRED)

if("${GSTREAMER_CLIENT_IMPLEMENTATION}" STREQUAL "Nexus")
if("${GSTREAMERCLIENT_IMPLEMENTATION}" STREQUAL "Nexus")
if (GSTREAMERCLIENT_IMPLEMENTATION_PATH)
add_subdirectory(${GSTREAMERCLIENT_IMPLEMENTATION_PATH})
else()
Expand All @@ -56,7 +62,7 @@ if (NOT "${GSTREAMER_CLIENT_IMPLEMENTATION}" STREQUAL "None")
add_subdirectory(Nexus)
endif()
else()
add_subdirectory (${GSTREAMER_CLIENT_IMPLEMENTATION})
add_subdirectory (${GSTREAMERCLIENT_IMPLEMENTATION})
endif()
endif()

Expand Down