From 96684fb5de8edb7d90086f03920429c2207b8a60 Mon Sep 17 00:00:00 2001 From: Adrien Beraud <adrien.beraud@savoirfairelinux.com> Date: Wed, 12 Jun 2024 11:16:15 -0400 Subject: [PATCH] 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 --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f7b90a541..dd6310e72d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -301,7 +301,7 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE PACKAGE_VERSION="${PROJECT_VERSION}" PACKAGE="jami" LIBJAMI_BUILD - HAVE_RINGNS + HAVE_RINGNS=1 ASIO_STANDALONE MSGPACK_NO_BOOST ) @@ -594,6 +594,9 @@ else() JAMI_DATADIR="${JAMI_DATADIR}" PJ_AUTOCONF=1 ) + if (BUILD_TESTING) + target_compile_definitions(${PROJECT_NAME} PRIVATE DEBUG) + endif() if (ANDROID) target_link_libraries(${PROJECT_NAME} PRIVATE OpenSLES log) elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux") @@ -809,9 +812,10 @@ else() target_compile_definitions(ut_library PUBLIC JAMI_DATADIR="${JAMI_DATADIR}" PJ_AUTOCONF=1 - HAVE_RINGNS + HAVE_RINGNS=1 ASIO_STANDALONE MSGPACK_NO_BOOST + DEBUG ) if (JAMI_PLUGIN) target_compile_definitions(ut_library PUBLIC ENABLE_PLUGIN) -- GitLab