Skip to content

Fix cmake_package install being broken because of wrong include path. #106

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.

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

Merged
merged 1 commit into from
Jan 6, 2015

Conversation

Gachapen
Copy link
Contributor

@Gachapen Gachapen commented Jan 6, 2015

The TARGET_INCLUDE_DIRECTORIES from inside the
IF(JSONCPP_WITH_CMAKE_PACKAGE) block was removed, since it only needs to
be set once.

JSON_INCLUDE_DIR was also replaced with JSONCPP_INCLUDE_DIR since the former is not defined.

In addition the CMAKE_VERSION check was simplified.

Fixes issue #105 and #104

The TARGET_INCLUDE_DIRECTORIES from inside the
IF(JSONCPP_WITH_CMAKE_PACKAGE) block was removed, since it only needs to
be set once.

In addition the CMAKE_VERSION check was simplified.
@Gachapen
Copy link
Contributor Author

Gachapen commented Jan 6, 2015

Maybe the install command should be tested with the build bot (I tested it manually of course)?

cdunn2001 added a commit that referenced this pull request Jan 6, 2015
Fix cmake_package install being broken because of wrong include path.
@cdunn2001 cdunn2001 merged commit 0f6884f into open-source-parsers:master Jan 6, 2015
@cdunn2001
Copy link
Contributor

Sweet.

If you add install to .travis.yml, we'll pull that too.

@Gachapen
Copy link
Contributor Author

Gachapen commented Jan 6, 2015

OK, I can do that when I have some more time available.

@Gachapen Gachapen deleted the fix_cmake_install branch January 6, 2015 22:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants