Mercurial > hg > freeDiameter
changeset 1455:75b6ec7c70b3
fix build for jsoncpp consumers
Correctly use the variables created by PKG_CHECK_MODULES(JSONCPP ...)
| author | Luke Mewburn <luke@mewburn.net> |
|---|---|
| date | Fri, 28 Feb 2020 10:08:37 +1100 |
| parents | 3afc9a884160 |
| children | 8627338e36ab |
| files | extensions/dbg_dict_dump_json/CMakeLists.txt extensions/dict_json/CMakeLists.txt |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/extensions/dbg_dict_dump_json/CMakeLists.txt Fri Feb 28 09:20:52 2020 +1100 +++ b/extensions/dbg_dict_dump_json/CMakeLists.txt Fri Feb 28 10:08:37 2020 +1100 @@ -8,9 +8,9 @@ # Uses JSONCPP to write JSON files PKG_CHECK_MODULES(JSONCPP REQUIRED jsoncpp) -INCLUDE_DIRECTORIES(${JSONCPP_INCLUDE_DIR}) -LINK_DIRECTORIES(${JSONCPP_LIBRDIR}) -TARGET_LINK_LIBRARIES(dbg_dict_dump_json ${JSONCPP_LINK_LIBRARIES}) +INCLUDE_DIRECTORIES(${JSONCPP_INCLUDE_DIRS}) +LINK_DIRECTORIES(${JSONCPP_LIBDIR}) +TARGET_LINK_LIBRARIES(dbg_dict_dump_json ${JSONCPP_LIBRARIES}) #### ## INSTALL section ##
--- a/extensions/dict_json/CMakeLists.txt Fri Feb 28 09:20:52 2020 +1100 +++ b/extensions/dict_json/CMakeLists.txt Fri Feb 28 10:08:37 2020 +1100 @@ -16,7 +16,7 @@ ) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${JSONCPP_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${JSONCPP_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${JSON_SCHEMA_INCLUDE_DIR}) LINK_DIRECTORIES(${JSONCPP_LIBDIR})