Skip to content
Snippets Groups Projects
Commit 8bdfb771 authored by François-Simon Fauteux-Chapleau's avatar François-Simon Fauteux-Chapleau
Browse files

cmake: add missing compile definition

The RING_ACCEL macro was not defined when compiling the unit tests with
the JAMI_VIDEO_ACCEL option enabled, which caused a heap buffer overflow
when running ut_media_decoder and resulted in the test failing in CI
with a "free(): invalid pointer" error.

GitLab: #1124
Change-Id: I333502a570224d9dd52a2b4e5e8ebe86d96e41a6
parent 95832cfc
No related branches found
No related tags found
No related merge requests found
...@@ -341,12 +341,12 @@ target_include_directories(${PROJECT_NAME} PRIVATE ...@@ -341,12 +341,12 @@ target_include_directories(${PROJECT_NAME} PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/src/client;" "${CMAKE_CURRENT_SOURCE_DIR}/src/client;"
"${CMAKE_CURRENT_SOURCE_DIR}/src/hooks;" "${CMAKE_CURRENT_SOURCE_DIR}/src/hooks;"
"${CMAKE_CURRENT_SOURCE_DIR}/src/im;" "${CMAKE_CURRENT_SOURCE_DIR}/src/im;"
"${CMAKE_CURRENT_SOURCE_DIR}/src/media;"
"${CMAKE_CURRENT_SOURCE_DIR}/src/jamidht;" "${CMAKE_CURRENT_SOURCE_DIR}/src/jamidht;"
"${CMAKE_CURRENT_SOURCE_DIR}/src/jamidht/eth;" "${CMAKE_CURRENT_SOURCE_DIR}/src/jamidht/eth;"
PUBLIC PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}/src;" "${CMAKE_CURRENT_SOURCE_DIR}/src;"
"${CMAKE_CURRENT_SOURCE_DIR}/src/jami;" "${CMAKE_CURRENT_SOURCE_DIR}/src/jami;"
"${CMAKE_CURRENT_SOURCE_DIR}/src/media;"
) )
if(MSVC) if(MSVC)
...@@ -831,6 +831,9 @@ else() ...@@ -831,6 +831,9 @@ else()
endif() endif()
if (JAMI_VIDEO) if (JAMI_VIDEO)
target_compile_definitions(ut_library PUBLIC ENABLE_VIDEO) target_compile_definitions(ut_library PUBLIC ENABLE_VIDEO)
if (JAMI_VIDEO_ACCEL)
target_compile_definitions(${PROJECT_NAME} PUBLIC RING_ACCEL)
endif()
endif() endif()
add_executable(ut_bootstrap test/unitTest/swarm/bootstrap.cpp) add_executable(ut_bootstrap test/unitTest/swarm/bootstrap.cpp)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment