From e99e6d9cc694f79e6fd5a497131b755e2614d0df Mon Sep 17 00:00:00 2001 From: Magnus Bjerke Vik Date: Wed, 3 Dec 2014 15:42:41 +0100 Subject: [PATCH 1/2] CMake: Add include directory to jsoncpp_lib target so that it can be easier used with other projects. --- src/lib_json/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib_json/CMakeLists.txt b/src/lib_json/CMakeLists.txt index 418044deb..ccef9aeb0 100644 --- a/src/lib_json/CMakeLists.txt +++ b/src/lib_json/CMakeLists.txt @@ -39,6 +39,10 @@ ADD_LIBRARY( jsoncpp_lib ${JSONCPP_LIB_TYPE} SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES OUTPUT_NAME jsoncpp ) SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_VERSION_MAJOR} ) +TARGET_INCLUDE_DIRECTORIES( jsoncpp_lib + PUBLIC ${JSONCPP_INCLUDE_DIR} + ) + # Install instructions for this target IF(JSONCPP_WITH_CMAKE_PACKAGE) TARGET_INCLUDE_DIRECTORIES( jsoncpp_lib From 3fd7f8b47092d69b4655e3e836d68444f7c2e27a Mon Sep 17 00:00:00 2001 From: Magnus Bjerke Vik Date: Tue, 16 Dec 2014 08:58:52 +0100 Subject: [PATCH 2/2] CMake: Only add include directory to jsoncpp_lib target if CMake version supports the command. --- src/lib_json/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lib_json/CMakeLists.txt b/src/lib_json/CMakeLists.txt index ccef9aeb0..d09ad8145 100644 --- a/src/lib_json/CMakeLists.txt +++ b/src/lib_json/CMakeLists.txt @@ -39,9 +39,11 @@ ADD_LIBRARY( jsoncpp_lib ${JSONCPP_LIB_TYPE} SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES OUTPUT_NAME jsoncpp ) SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_VERSION_MAJOR} ) -TARGET_INCLUDE_DIRECTORIES( jsoncpp_lib - PUBLIC ${JSONCPP_INCLUDE_DIR} - ) +IF(CMAKE_VERSION VERSION_EQUAL 2.8.11 OR CMAKE_VERSION VERSION_GREATER 2.8.11) + TARGET_INCLUDE_DIRECTORIES( jsoncpp_lib + PUBLIC ${JSONCPP_INCLUDE_DIR} + ) +ENDIF(CMAKE_VERSION VERSION_EQUAL 2.8.11 OR CMAKE_VERSION VERSION_GREATER 2.8.11) # Install instructions for this target IF(JSONCPP_WITH_CMAKE_PACKAGE)