Skip to content
Snippets Groups Projects
Commit 96684fb5 authored by Adrien Béraud's avatar Adrien Béraud Committed by Adrien Béraud
Browse files

CMake: unify build definitions with Meson and Autotools

* Use 0 or 1 for HAVE_RINGNS
* Add DEBUG when tests are enabled

GitLab: #544
Change-Id: I2e6a1ae12b3658a8b7d3ebfc160c3e4dbcbeadb0
parent b4d39a1e
No related branches found
No related tags found
No related merge requests found
...@@ -301,7 +301,7 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE ...@@ -301,7 +301,7 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE
PACKAGE_VERSION="${PROJECT_VERSION}" PACKAGE_VERSION="${PROJECT_VERSION}"
PACKAGE="jami" PACKAGE="jami"
LIBJAMI_BUILD LIBJAMI_BUILD
HAVE_RINGNS HAVE_RINGNS=1
ASIO_STANDALONE ASIO_STANDALONE
MSGPACK_NO_BOOST MSGPACK_NO_BOOST
) )
...@@ -594,6 +594,9 @@ else() ...@@ -594,6 +594,9 @@ else()
JAMI_DATADIR="${JAMI_DATADIR}" JAMI_DATADIR="${JAMI_DATADIR}"
PJ_AUTOCONF=1 PJ_AUTOCONF=1
) )
if (BUILD_TESTING)
target_compile_definitions(${PROJECT_NAME} PRIVATE DEBUG)
endif()
if (ANDROID) if (ANDROID)
target_link_libraries(${PROJECT_NAME} PRIVATE OpenSLES log) target_link_libraries(${PROJECT_NAME} PRIVATE OpenSLES log)
elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux") elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
...@@ -809,9 +812,10 @@ else() ...@@ -809,9 +812,10 @@ else()
target_compile_definitions(ut_library PUBLIC target_compile_definitions(ut_library PUBLIC
JAMI_DATADIR="${JAMI_DATADIR}" JAMI_DATADIR="${JAMI_DATADIR}"
PJ_AUTOCONF=1 PJ_AUTOCONF=1
HAVE_RINGNS HAVE_RINGNS=1
ASIO_STANDALONE ASIO_STANDALONE
MSGPACK_NO_BOOST MSGPACK_NO_BOOST
DEBUG
) )
if (JAMI_PLUGIN) if (JAMI_PLUGIN)
target_compile_definitions(ut_library PUBLIC ENABLE_PLUGIN) target_compile_definitions(ut_library PUBLIC ENABLE_PLUGIN)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment