diff options
| author | Luboš Doležel <lubos@dolezel.info> | 2020-02-23 09:35:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-23 09:35:17 +0100 |
| commit | 2e8c5d2745d64baee973cb3452f58af5ef9bd29e (patch) | |
| tree | 92cca7ce688dbf1df2e21a043544b88ca790f471 | |
| parent | 2d673fe5daa8f5f930657c1bd537ab4df3e5ad06 (diff) | |
| parent | 97ba6270f0ec26a09943715208b89baf31015aa6 (diff) | |
| download | twinkle-2e8c5d2745d64baee973cb3452f58af5ef9bd29e.tar twinkle-2e8c5d2745d64baee973cb3452f58af5ef9bd29e.tar.gz twinkle-2e8c5d2745d64baee973cb3452f58af5ef9bd29e.tar.lz twinkle-2e8c5d2745d64baee973cb3452f58af5ef9bd29e.tar.xz twinkle-2e8c5d2745d64baee973cb3452f58af5ef9bd29e.zip | |
Merge pull request #181 from fbriere/fix/ucommon-ndebug
Add -DDEBUG to non-release builds, to prevent uCommon from adding NDEBUG
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5315383..1a6d4be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,14 @@ project(twinkle) -cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR) +cmake_minimum_required(VERSION 2.8.10 FATAL_ERROR) set(PRODUCT_VERSION "1.10.2") set(PRODUCT_DATE "February 14, 2018") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +# Add -DDEBUG for non-release builds, or uCommon will unilaterally define NDEBUG +# (https://lists.gnu.org/archive/html/bug-commoncpp/2019-12/msg00000.html) +set_directory_properties(PROPERTIES + COMPILE_DEFINITIONS $<$<OR:$<CONFIG:>,$<CONFIG:Debug>>:DEBUG>) OPTION(WITH_ZRTP "Enable ZRTP encrypted calls" OFF) OPTION(WITH_SPEEX "Enable the Speex codec" OFF) |