Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions cmake/defaults/CYCOMMON.cmake
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Common build dependencies for all CY20XX platforms aja https://github.com/aja-video/libajantv2
SET(RV_DEPS_AJA_VERSION
"17.1.0"
"17.6.0.hotfix1"
)
SET(RV_DEPS_AJA_DOWNLOAD_HASH
"b9d189f77e18dbdff7c39a339b1a5dd4"
"dba447ddd1b0ee84cee8441c0adba06a"
)

# atomic_ops https://github.com/ivmai/libatomic_ops
Expand Down
35 changes: 6 additions & 29 deletions cmake/dependencies/aja.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ SET(_download_hash
"${RV_DEPS_AJA_DOWNLOAD_HASH}"
)

IF(RV_TARGET_WINDOWS)
IF(RV_TARGET_WINDOWS
AND CMAKE_BUILD_TYPE MATCHES "^Debug$"
)
RV_MAKE_STANDARD_LIB_NAME(ajantv2_vs143_MT "" "SHARED" "d")
ELSE()
RV_MAKE_STANDARD_LIB_NAME(ajantv2 "" "SHARED" "d")
Expand All @@ -30,28 +32,6 @@ SET(_aja_include_dir
${_include_dir}/libajantv2
)

IF(RHEL_VERBOSE)
SET(_mbedtls_lib_dir
${_build_dir}/ajantv2/mbedtls-install/lib64
)
ELSE()
SET(_mbedtls_lib_dir
${_build_dir}/ajantv2/mbedtls-install/lib
)
ENDIF()

SET(_mbedtls_lib
${_mbedtls_lib_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}mbedtls${CMAKE_STATIC_LIBRARY_SUFFIX}
)
SET(_mbedx509_lib
${_mbedtls_lib_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}mbedx509${CMAKE_STATIC_LIBRARY_SUFFIX}
)
SET(_mbedcrypto_lib
${_mbedtls_lib_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}mbedcrypto${CMAKE_STATIC_LIBRARY_SUFFIX}
)

LIST(APPEND _byproducts ${_mbedtls_lib} ${_mbedx509_lib} ${_mbedcrypto_lib})

# There is an issue with the recent AJA SDK : the OS specific header files are no longer copied to _aja_ntv2_include_dir Adding custom paths here to work around
# this issue
IF(RV_TARGET_LINUX)
Expand All @@ -75,6 +55,8 @@ LIST(
"-DAJANTV2_DISABLE_TOOLS=ON"
"-DAJANTV2_DISABLE_TESTS=ON"
"-DAJANTV2_BUILD_SHARED=ON"
"-DAJANTV2_DISABLE_PLUGIN_LOAD=ON"
"-DAJANTV2_DISABLE_DRIVER=ON"
"-DNTV2_VERSION_BUILD=0"
)

Expand All @@ -97,7 +79,7 @@ EXTERNALPROJECT_ADD(
INSTALL_DIR ${_install_dir}
CONFIGURE_COMMAND ${CMAKE_COMMAND} ${_configure_options}
BUILD_COMMAND ${_cmake_build_command}
INSTALL_COMMAND ${_cmake_install_command} && ${CMAKE_COMMAND} -E copy_directory ${_mbedtls_lib_dir} ${_lib_dir}
INSTALL_COMMAND ${_cmake_install_command}
BUILD_IN_SOURCE FALSE
BUILD_ALWAYS FALSE
BUILD_BYPRODUCTS ${_byproducts}
Expand Down Expand Up @@ -126,11 +108,6 @@ RV_ADD_IMPORTED_LIBRARY(
ADD_TO_DEPS_LIST
)

TARGET_LINK_LIBRARIES(
aja::ntv2
INTERFACE ${_mbedtls_lib} ${_mbedx509_lib} ${_mbedcrypto_lib}
)

IF(RV_TARGET_DARWIN)
LIST(APPEND _aja_compile_options "-DAJAMac=1")
LIST(APPEND _aja_compile_options "-DAJA_MAC=1")
Expand Down
Loading