Skip to content

Commit ba2d3ad

Browse files
author
norberttakacs
committed
json-c: move CMake json options to public
This neds to be able to use json libraries with cmake in other parts as well. Signed-off-by: norberttakacs <norbert.takacs@balabit.com>
1 parent bb828c0 commit ba2d3ad

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

CMakeLists.txt

+3
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ if ((NOT IVYKIS_INTERNAL) AND (IVYKIS_PKGCONF_VERSION VERSION_LESS "0.39"))
130130
set (SYSLOG_NG_USE_CONST_IVYKIS_MOCK 0)
131131
endif()
132132

133+
external_or_find_package(JSONC)
134+
133135
find_package(OpenSSL REQUIRED)
134136
find_package(FLEX REQUIRED)
135137
find_package(LibNet REQUIRED)
@@ -254,6 +256,7 @@ add_subdirectory(syslog-ng)
254256
add_subdirectory(syslog-ng-ctl)
255257
add_test_subdirectory(libtest)
256258
add_subdirectory(tests)
259+
add_subdirectory(persist-tool)
257260

258261
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syslog-ng-config.h DESTINATION include/syslog-ng)
259262

modules/json/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ set(JSON_SOURCES
1414

1515
set(JSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
1616

17-
external_or_find_package(JSONC)
18-
1917
if(JSONC_FOUND)
2018
option(ENABLE_JSON "Enable JSON plugin" ON)
2119
else()

0 commit comments

Comments
 (0)