Browse Source

cmake/json: Remove find_package call. Use pkg-config instead.

(cherry picked from commit 99d36df0a15bbb960b2d7ee5916d65a55b9b26cd)
Xenofon Karamanos 7 tháng trước cách đây
mục cha
commit
d0360fbb8e
1 tập tin đã thay đổi với 13 bổ sung8 xóa
  1. 13 8
      src/modules/json/CMakeLists.txt

+ 13 - 8
src/modules/json/CMakeLists.txt

@@ -2,13 +2,18 @@ file(GLOB MODULE_SOURCES "*.c")
 
 add_library(${module_name} SHARED ${MODULE_SOURCES})
 
-find_package(json-c CONFIG)
-
-if(NOT json-c_FOUND)
-  message(STATUS "json-c not found. looking with pkg-config")
-  find_package(PkgConfig REQUIRED)
-  pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c)
-  add_library(json-c::json-c ALIAS PkgConfig::json-c)
-endif()
+# TODO: When we have a proper cmake config file for json-c for most OS, we can
+# use that instead of pkg-config.
+# json-c v 0.14 and 0.15 have wrong include directories in their cmake config
+# files. uncomment the following line when we have a proper cmake config file
+# for json-c for most OS.
+# find_package(json-c 0.16 CONFIG)
+
+# if(NOT json-c_FOUND)
+message(STATUS "json-c not found. looking with pkg-config")
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c)
+add_library(json-c::json-c ALIAS PkgConfig::json-c)
+# endif()
 
 target_link_libraries(${module_name} PRIVATE json-c::json-c)