Skip to content

Commit

Permalink
Merge pull request #1464 from elvisoric/update_meson_install_step
Browse files Browse the repository at this point in the history
Disable installation when used as meson subproject. #1463
  • Loading branch information
nlohmann authored Feb 10, 2019
2 parents 68ec3eb + 77d1d37 commit eee3bc0
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ nlohmann_json_multiple_headers = declare_dependency(
include_directories: include_directories('include')
)

if not meson.is_subproject()
install_headers('single_include/nlohmann/json.hpp', subdir: 'nlohmann')

pkgc = import('pkgconfig')
pkgc.generate(name: 'nlohmann_json',
version: meson.project_version(),
description: 'JSON for Modern C++'
)
endif

0 comments on commit eee3bc0

Please sign in to comment.