Skip to content

Commit dc84d96

Browse files
committed
Add CMake package file generation support
1 parent 1c3a20d commit dc84d96

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

CMakeLists.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ OPTION(JSONCPP_WITH_TESTS "Compile and run JsonCpp test executables" ON)
66
OPTION(JSONCPP_WITH_POST_BUILD_UNITTEST "Automatically run unit-tests as a post build step" ON)
77
OPTION(JSONCPP_WITH_WARNING_AS_ERROR "Force compilation to fail if a warning occurs" OFF)
88
OPTION(JSONCPP_WITH_PKGCONFIG_SUPPORT "Generate and install .pc files" ON)
9+
OPTION(JSONCPP_WITH_CMAKE_PACKAGE "Generate and install cmake package files" OFF)
910

1011
# Ensures that CMAKE_BUILD_TYPE is visible in cmake-gui on Unix
1112
IF(NOT WIN32)
@@ -24,7 +25,9 @@ SET(LIBRARY_INSTALL_DIR lib
2425
CACHE PATH "Install dir for shared libraries")
2526
SET(INCLUDE_INSTALL_DIR include
2627
CACHE PATH "Install dir for headers")
27-
MARK_AS_ADVANCED( RUNTIME_INSTALL_DIR ARCHIVE_INSTALL_DIR INCLUDE_INSTALL_DIR )
28+
SET(PACKAGE_INSTALL_DIR lib/cmake
29+
CACHE PATH "Install dir for cmake package config files")
30+
MARK_AS_ADVANCED( RUNTIME_INSTALL_DIR ARCHIVE_INSTALL_DIR INCLUDE_INSTALL_DIR PACKAGE_INSTALL_DIR )
2831

2932
# This ensures shared DLL are in the same dir as executable on Windows.
3033
# Put all executables / libraries are in a project global directory.
@@ -101,6 +104,12 @@ IF(JSONCPP_WITH_PKGCONFIG_SUPPORT)
101104
DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
102105
ENDIF(JSONCPP_WITH_PKGCONFIG_SUPPORT)
103106

107+
IF(JSONCPP_WITH_CMAKE_PACKAGE)
108+
INSTALL(EXPORT jsoncpp
109+
DESTINATION ${PACKAGE_INSTALL_DIR}/jsoncpp
110+
FILE jsoncppConfig.cmake)
111+
ENDIF(JSONCPP_WITH_CMAKE_PACKAGE)
112+
104113
# Build the different applications
105114
ADD_SUBDIRECTORY( src )
106115

src/lib_json/CMakeLists.txt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,17 @@ SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES OUTPUT_NAME jsoncpp )
4040
SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_VERSION_MAJOR} )
4141

4242
# Install instructions for this target
43-
INSTALL( TARGETS jsoncpp_lib
43+
IF(JSONCPP_WITH_CMAKE_PACKAGE)
44+
TARGET_INCLUDE_DIRECTORIES( jsoncpp_lib
45+
PUBLIC $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
46+
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/${JSON_INCLUDE_DIR}>
47+
)
48+
SET(INSTALL_EXPORT EXPORT jsoncpp)
49+
ELSE(JSONCPP_WITH_CMAKE_PACKAGE)
50+
SET(INSTALL_EXPORT)
51+
ENDIF(JSONCPP_WITH_CMAKE_PACKAGE)
52+
53+
INSTALL( TARGETS jsoncpp_lib ${INSTALL_EXPORT}
4454
RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR}
4555
LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR}
4656
ARCHIVE DESTINATION ${ARCHIVE_INSTALL_DIR}

0 commit comments

Comments
 (0)