From b7fb3b074657a81cfc89ea2b18c2dd53379d0d1b Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Sat, 18 Apr 2020 13:50:53 +0200 Subject: [PATCH] cmake: fix jansson defines, keep them local --- client/deps/hardnested.cmake | 1 - client/deps/jansson.cmake | 4 ++-- client/deps/mbedtls.cmake | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/client/deps/hardnested.cmake b/client/deps/hardnested.cmake index b9e0bfa82..fb4fd881a 100644 --- a/client/deps/hardnested.cmake +++ b/client/deps/hardnested.cmake @@ -1,5 +1,4 @@ set_property(SOURCE PROPERTY C_STANDARD 99) -add_definitions(-DHAVE_STDINT_H) include_directories(hardnested) ## CPU-specific code diff --git a/client/deps/jansson.cmake b/client/deps/jansson.cmake index f35d7dbc9..bb004d155 100644 --- a/client/deps/jansson.cmake +++ b/client/deps/jansson.cmake @@ -1,6 +1,4 @@ set_property(SOURCE PROPERTY C_STANDARD 99) -add_definitions(-DHAVE_STDINT_H) -include_directories(jansson) add_library(jansson jansson/dump.c @@ -16,3 +14,5 @@ add_library(jansson jansson/path.c jansson/value.c ) + +target_compile_definitions(jansson PRIVATE HAVE_STDINT_H) diff --git a/client/deps/mbedtls.cmake b/client/deps/mbedtls.cmake index 0b4c04e62..9e3d0f8a6 100644 --- a/client/deps/mbedtls.cmake +++ b/client/deps/mbedtls.cmake @@ -1,5 +1,4 @@ set_property(SOURCE PROPERTY C_STANDARD 99) -add_definitions(-DHAVE_STDINT_H) include_directories(../../common) add_library(mbedtls