Cmake config new #157
Merged
Cmake config new #157
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This will simplify linking against the lib, both from the build-tree and install-tree from other CMake projects. CMakes find_package command uses these configs to locate the exported targets for the library. * Also changed so that all CMake options for the project are prepended with JANSSON_ so that there is no ambiguity when including this as a subdirectory in another CMake project.
This is because it's really easy to get a name collission if compiling Jansson as a subproject in a larger CMake project. If one project includes several subprojects each having their own config.h, this will cause the wrong file to be loaded.
|
Fixed the stuff you commented |
|
@akheron Anything more you want me to fix? |
akheron
added a commit
that referenced
this pull request
Jan 28, 2014
|
Merged, thanks. |
| ${CMAKE_CURRENT_BINARY_DIR}/private_include/config.h) | ||
|
|
||
| # and tell the source code to include it | ||
| add_definitions (-DHAVE_CONFIG_H) |
There was a problem hiding this comment.
Is this the correct thing to do? Does it include jansson_private_config.h at all now?
There was a problem hiding this comment.
Damn that's a mistake... see #159
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rebased version of #155 to get rid of the ugly merge mess.
Also added the config.h name change for autoconf in this one.