From 0f766b45803bb40d4956c8071c5b3c7265832817 Mon Sep 17 00:00:00 2001 From: Matthew O'Connell Date: Fri, 11 Aug 2017 14:49:05 -0400 Subject: [PATCH] To set install dir --- CMakeLists.txt | 1 + cmake/config.cmake.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fb9f4c51..9253646b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,7 @@ configure_package_config_file( ${NLOHMANN_JSON_CMAKE_CONFIG_TEMPLATE} ${NLOHMANN_JSON_CMAKE_PROJECT_CONFIG_FILE} INSTALL_DESTINATION ${NLOHMANN_JSON_CONFIG_INSTALL_DIR} + PATH_VARS NLOHMANN_JSON_HEADER_INSTALL_DIR ) install( DIRECTORY ${NLOHMANN_JSON_SOURCE_DIR} diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in index 3ea43afb8..b26fd6d72 100644 --- a/cmake/config.cmake.in +++ b/cmake/config.cmake.in @@ -1,4 +1,4 @@ @PACKAGE_INIT@ -set_and_check(JSON_INCLUDE_DIR "@NLOHMANN_JSON_HEADER_INSTALL_DIR@") +set_and_check(JSON_INCLUDE_DIR "@PACKAGE_NLOHMANN_JSON_HEADER_INSTALL_DIR@") include("${CMAKE_CURRENT_LIST_DIR}/@NLOHMANN_JSON_TARGETS_EXPORT_NAME@.cmake") check_required_components("@PROJECT_NAME@")