Skip to content

Refactor duplicated Rialto discovery logic into reusable CMake function #879

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

Draft
Copilot wants to merge 2 commits into
base: feature/VPLAY-12110-simplified
Choose a base branch
from
Draft

Refactor duplicated Rialto discovery logic into reusable CMake function #879

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
163a029
Initial plan
Copilot Jan 17, 2026
4e1d18a
Extract duplicated Rialto discovery logic into reusable CMake function
Copilot Jan 17, 2026
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
59 changes: 20 additions & 39 deletions test/rialtoPOC/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,8 @@ set(rialtoPOC_DEPENDS

set(TEST_ROOT "../")

if (NOT CMAKE_PLATFORM_UBUNTU AND NOT CMAKE_SYSTEM_NAME STREQUAL Darwin AND CMAKE_BUILD_RIALTO_POC)
# Rialto POC 2
set(RIALTOPOC2_SOURCES
${TEST_ROOT}/gstTestHarness/mp4demux.hpp
rialto-pipeline2.cpp
rialto-pipeline2.h
rialto-test2.cpp
)

# Function to discover and configure Rialto dependencies
function(find_and_configure_rialto)
find_path( RIALTO_INCLUDE_DIR NAMES IMediaPipeline.h PATH_SUFFIXES rialto)
find_library( RIALTO_LIBRARY NAMES libRialtoClient.so RialtoClient )
include( FindPackageHandleStandardArgs )
Expand All @@ -70,11 +63,13 @@ if (NOT CMAKE_PLATFORM_UBUNTU AND NOT CMAKE_SYSTEM_NAME STREQUAL Darwin AND CMAK
)

if( RIALTO_FOUND )
set( RIALTO_LIBRARIES ${RIALTO_LIBRARY} )
set(RIALTO_INCLUDE_DIRS
set( RIALTO_LIBRARIES ${RIALTO_LIBRARY} PARENT_SCOPE )
set( RIALTO_INCLUDE_DIRS
${RIALTO_INCLUDE_DIR}
${RIALTO_GSTREAMER_INCLUDE_DIR}
)
PARENT_SCOPE
)
set( RIALTO_FOUND ${RIALTO_FOUND} PARENT_SCOPE )
endif()

if( RIALTO_FOUND AND NOT TARGET Rialto::RialtoClient )
Expand All @@ -83,6 +78,19 @@ if (NOT CMAKE_PLATFORM_UBUNTU AND NOT CMAKE_SYSTEM_NAME STREQUAL Darwin AND CMAK
IMPORTED_LOCATION "${RIALTO_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${RIALTO_INCLUDE_DIR}" )
endif()
endfunction()

if (NOT CMAKE_PLATFORM_UBUNTU AND NOT CMAKE_SYSTEM_NAME STREQUAL Darwin AND CMAKE_BUILD_RIALTO_POC)
# Discover Rialto dependencies once
find_and_configure_rialto()

# Rialto POC 2
set(RIALTOPOC2_SOURCES
${TEST_ROOT}/gstTestHarness/mp4demux.hpp
rialto-pipeline2.cpp
rialto-pipeline2.h
rialto-test2.cpp
)

add_executable(rialtoPOC2 ${RIALTOPOC2_SOURCES})
target_link_libraries(rialtoPOC2 ${RIALTO_LIBRARIES} ${rialtoPOC_DEPENDS} "-lreadline" Rialto::RialtoClient)
Expand All @@ -98,33 +106,6 @@ if (NOT CMAKE_PLATFORM_UBUNTU AND NOT CMAKE_SYSTEM_NAME STREQUAL Darwin AND CMAK
rialto-test3.cpp
)

find_path( RIALTO_INCLUDE_DIR NAMES IMediaPipeline.h PATH_SUFFIXES rialto)
find_library( RIALTO_LIBRARY NAMES libRialtoClient.so RialtoClient )
include( FindPackageHandleStandardArgs )
find_package_handle_standard_args( RIALTO DEFAULT_MSG
RIALTO_LIBRARY RIALTO_INCLUDE_DIR )

mark_as_advanced(
RIALTO_INCLUDE_DIR
RIALTO_LIBRARY
RIALTO_GSTREAMER_INCLUDE_DIR
)

if( RIALTO_FOUND )
set( RIALTO_LIBRARIES ${RIALTO_LIBRARY} )
set(RIALTO_INCLUDE_DIRS
${RIALTO_INCLUDE_DIR}
${RIALTO_GSTREAMER_INCLUDE_DIR}
)
endif()

if( RIALTO_FOUND AND NOT TARGET Rialto::RialtoClient )
add_library( Rialto::RialtoClient SHARED IMPORTED )
set_target_properties( Rialto::RialtoClient PROPERTIES
IMPORTED_LOCATION "${RIALTO_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${RIALTO_INCLUDE_DIR}" )
endif()

add_executable(rialtoPOC3 ${RIALTOPOC3_SOURCES})
target_link_libraries(rialtoPOC3 ${RIALTO_LIBRARIES} ${rialtoPOC_DEPENDS} "-lreadline" Rialto::RialtoClient)
install(TARGETS rialtoPOC3
Expand Down
Loading