Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include dir relocation #318

Merged
merged 9 commits into from
Oct 6, 2016
Merged

Include dir relocation #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
25ccf7f
Merge branch 'release/2.0.0'
nlohmann Jun 23, 2016
e29d6b5
Merge branch 'release/2.0.1'
nlohmann Jun 28, 2016
8b39570
Merge branch 'develop'
nlohmann Jun 28, 2016
3586767
Merge branch 'release/v2.0.2'
nlohmann Jul 31, 2016
2c82f25
Merge branch 'release/2.0.3'
nlohmann Aug 31, 2016
625370a
Merge branch 'develop'
nlohmann Sep 2, 2016
f209be1
Merge branch 'release/2.0.4'
nlohmann Sep 11, 2016
5879eb0
Merge branch 'release/2.0.5'
nlohmann Sep 14, 2016
e1b6a23
relocation of install-include directory for other packages
Sep 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion cmake/config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@PACKAGE_INIT@
set_and_check(JSON_INCLUDE_DIR "@PACKAGE_JSON_INCLUDE_DESTINATION@")

cmake_policy(PUSH)
cmake_policy(SET CMP0024 OLD)
include(${CMAKE_CURRENT_LIST_DIR}/@JSON_TARGETS_FILENAME@)
cmake_policy(POP)
cmake_policy(POP)