Skip to content

Commit f2a0eea

Browse files
committed
enhance json-c package finding
1 parent 8beffb8 commit f2a0eea

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,3 @@ endif ()
124124
if (ziti-sdk_IS_TOP_LEVEL AND EXISTS "${CMAKE_CURRENT_LIST_DIR}/local.cmake")
125125
include("${CMAKE_CURRENT_LIST_DIR}/local.cmake")
126126
endif ()
127-

library/CMakeLists.txt

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,20 @@ if (ziti_DEVELOPER_MODE)
4747
endif ()
4848
endif ()
4949

50-
find_package(json-c CONFIG REQUIRED)
50+
find_package(json-c CONFIG QUIET)
51+
if(NOT json-c_FOUND)
52+
find_package(PkgConfig REQUIRED)
53+
pkg_check_modules(JSONC REQUIRED json-c)
54+
include_directories(${JSONC_INCLUDE_DIRS})
55+
link_libraries(${JSONC_LIBRARIES})
56+
if(NOT TARGET json-c::json-c)
57+
add_library(json-c::json-c INTERFACE IMPORTED)
58+
set_target_properties(json-c::json-c PROPERTIES
59+
INTERFACE_INCLUDE_DIRECTORIES "${JSONC_INCLUDE_DIRS}"
60+
INTERFACE_LINK_LIBRARIES "${JSONC_LIBRARIES}"
61+
)
62+
endif()
63+
endif()
5164

5265
set(ZITI_HEADER_FILES
5366
${PROJECT_SOURCE_DIR}/includes/ziti/errors.h

0 commit comments

Comments
 (0)