Skip to content

Commit 748328a

Browse files
committed
Fix cmake_package install being broken because of wrong include path.
The TARGET_INCLUDE_DIRECTORIES from inside the IF(JSONCPP_WITH_CMAKE_PACKAGE) block was removed, since it only needs to be set once. In addition the CMAKE_VERSION check was simplified.
1 parent f44278c commit 748328a

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/lib_json/CMakeLists.txt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,15 @@ ADD_LIBRARY( jsoncpp_lib ${JSONCPP_LIB_TYPE}
4949
SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES OUTPUT_NAME jsoncpp )
5050
SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_VERSION_MAJOR} )
5151

52-
IF(CMAKE_VERSION VERSION_EQUAL 2.8.11 OR CMAKE_VERSION VERSION_GREATER 2.8.11)
53-
TARGET_INCLUDE_DIRECTORIES( jsoncpp_lib
54-
PUBLIC ${JSONCPP_INCLUDE_DIR}
52+
IF(NOT CMAKE_VERSION VERSION_LESS 2.8.11)
53+
TARGET_INCLUDE_DIRECTORIES( jsoncpp_lib PUBLIC
54+
$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
55+
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/${JSONCPP_INCLUDE_DIR}>
5556
)
56-
ENDIF(CMAKE_VERSION VERSION_EQUAL 2.8.11 OR CMAKE_VERSION VERSION_GREATER 2.8.11)
57+
ENDIF(NOT CMAKE_VERSION VERSION_LESS 2.8.11)
5758

5859
# Install instructions for this target
5960
IF(JSONCPP_WITH_CMAKE_PACKAGE)
60-
TARGET_INCLUDE_DIRECTORIES( jsoncpp_lib
61-
PUBLIC $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
62-
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/${JSON_INCLUDE_DIR}>
63-
)
6461
SET(INSTALL_EXPORT EXPORT jsoncpp)
6562
ELSE(JSONCPP_WITH_CMAKE_PACKAGE)
6663
SET(INSTALL_EXPORT)

0 commit comments

Comments
 (0)