Merge pull request #1901 from JackBoosY/master

Use modern cmake function export to generate target

CMakeLists.txt

@@ -195,6 +195,11 @@ install(FILES readme.md
  DESTINATION "${DOC_INSTALL_DIR}"
  COMPONENT doc)
 
+# Add an interface target to export it
+add_library(RapidJSON INTERFACE)
+
+target_include_directories(RapidJSON INTERFACE $<INSTALL_INTERFACE:include/rapidjson>)
+
 install(DIRECTORY include/rapidjson
  DESTINATION "${INCLUDE_INSTALL_DIR}"
  COMPONENT dev)
@@ -221,6 +226,7 @@ SET( CONFIG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 SET( CONFIG_DIR ${CMAKE_CURRENT_BINARY_DIR})
 SET( ${PROJECT_NAME}_INCLUDE_DIR "\${${PROJECT_NAME}_SOURCE_DIR}/include" )
 
+INCLUDE(CMakePackageConfigHelpers)
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in
  ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake @ONLY )
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}ConfigVersion.cmake.in
@@ -243,9 +249,12 @@ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PROJECT_NAM
 
 # Install files
 IF(CMAKE_INSTALL_DIR)
- INSTALL(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
- DESTINATION "${CMAKE_INSTALL_DIR}"
- COMPONENT dev)
+ INSTALL(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+ DESTINATION "${CMAKE_INSTALL_DIR}"
+ COMPONENT dev)
+
+ INSTALL(TARGETS RapidJSON EXPORT RapidJSON-targets)
+ INSTALL(EXPORT RapidJSON-targets DESTINATION ${CMAKE_INSTALL_DIR})
 ENDIF()

RapidJSONConfig.cmake.in

@@ -1,6 +1,6 @@
-################################################################################
-# CMake minimum version required
-cmake_minimum_required(VERSION 3.0)
+@PACKAGE_INIT@
+
+include ("${CMAKE_CURRENT_LIST_DIR}/RapidJSON-targets.cmake")
 
 ################################################################################
 # RapidJSON source dir
@@ -14,12 +14,6 @@ set( RapidJSON_DIR "@CONFIG_DIR@")
 # Compute paths
 get_filename_component(RapidJSON_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 
-set( RapidJSON_INCLUDE_DIR "@RapidJSON_INCLUDE_DIR@" )
-set( RapidJSON_INCLUDE_DIRS "@RapidJSON_INCLUDE_DIR@" )
-message(STATUS "RapidJSON found. Headers: ${RapidJSON_INCLUDE_DIRS}")
+get_target_property(RapidJSON_INCLUDE_DIR RapidJSON INTERFACE_INCLUDE_DIRECTORIES)
 
-if(NOT TARGET rapidjson)
- add_library(rapidjson INTERFACE IMPORTED)
- set_property(TARGET rapidjson PROPERTY
- INTERFACE_INCLUDE_DIRECTORIES ${RapidJSON_INCLUDE_DIRS})
-endif()
+set( RapidJSON_INCLUDE_DIRS ${RapidJSON_INCLUDE_DIR} )