mirror/cJSON
1
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2023-08-10 21:13:26 +03:00
Code Issues Projects Releases Wiki Activity

Fix pkgconfig and installation. Thanks @zeerd for reporting

Browse Source 
CMAKE_INSTALL_FULL_... needs to be used.
This commit is contained in:
Max Bruckner
2018-02-06 11:24:03 +01:00
parent 7cc52f6035
commit f47271f455
4 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library_config/cJSONConfig.cmake.in
View File

@ -2,8 +2,8 @@
set(CJSON_UTILS_FOUND @ENABLE_CJSON_UTILS@)
# The include directories used by cJSON
set(CJSON_INCLUDE_DIRS "@prefix@/@includedir@")
set(CJSON_INCLUDE_DIR "@prefix@/@includedir@")
set(CJSON_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
set(CJSON_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
get_filename_component(_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)

7
library_config/libcjson.pc.in
View File

@ -1,9 +1,8 @@
prefix=@prefix@
libdir=${prefix}/@libdir@
includedir=${prefix}/@includedir@
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
Name: libcjson
Version: @version@
Version: @PROJECT_VERSION@
Description: Ultralightweight JSON parser in ANSI C
URL: https://github.com/DaveGamble/cJSON
Libs: -L${libdir} -lcjson

7
library_config/libcjson_utils.pc.in
View File

@ -1,9 +1,8 @@
prefix=@prefix@
libdir=${prefix}/@libdir@
includedir=${prefix}/@includedir@
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
Name: libcjson_utils
Version: @version@
Version: @PROJECT_VERSION@
Description: An implementation of JSON Pointer, Patch and Merge Patch based on cJSON.
URL: https://github.com/DaveGamble/cJSON
Libs: -L${libdir} -lcjson_utils