Merge pull request #318 from ChristophJud/include_dir_relocation

Include dir relocation
2016-10-06 22:35:36 +02:00 · 2016-10-06 22:35:36 +02:00 · 04b11d78ff
commit 04b11d78ff
parent 8173c370f6 e1b6a23049
2 changed files with 4 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -31,7 +31,8 @@ endif()
 include(CMakePackageConfigHelpers)
 configure_package_config_file("cmake/config.cmake.in"
    "${CMAKE_CURRENT_BINARY_DIR}/${JSON_CONFIG_FILENAME}"
-    INSTALL_DESTINATION ${JSON_CONFIG_DESTINATION})
+    INSTALL_DESTINATION ${JSON_CONFIG_DESTINATION}
+    PATH_VARS JSON_INCLUDE_DESTINATION)
 write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/${JSON_CONFIGVERSION_FILENAME}"
    VERSION ${PROJECT_VERSION}
    COMPATIBILITY SameMajorVersion)
--- a/cmake/config.cmake.in
+++ b/cmake/config.cmake.in
@ -1,4 +1,5 @@
@PACKAGE_INIT@
+set_and_check(JSON_INCLUDE_DIR "@PACKAGE_JSON_INCLUDE_DESTINATION@")

 cmake_policy(PUSH)
 cmake_policy(SET CMP0024 OLD)