Clean up cvconfig.h.tmpl#1110
Merged
opencv-pushbot merged 10 commits intoopencv:2.4from Jul 30, 2013
SpecLad:config-cleanup
Merged
Clean up cvconfig.h.tmpl#1110opencv-pushbot merged 10 commits intoopencv:2.4from SpecLad:config-cleanup
opencv-pushbot merged 10 commits intoopencv:2.4from
SpecLad:config-cleanup
Conversation
added 10 commits
July 10, 2013 16:02
I've left HAVE_LIBPTHREAD as a CMake variable, since TBB's build depends on it. Some macros in internal.hpp depended on HAVE_ALLOCA_H, but they were, in turn, unused, so I've just deleted them all.
Now the HAVE_* macros are set using cvconfig.h. Previously most of them already were there, but were always undefined. One, HAVE_COCOA, I had to add. This also makes the CMake code more consistent; now, WITH_* variables are always checked in cmake/*, while HAVE_* variables are checked in modules/highgui/CMakeLists.txt.
Now the HAVE_* macros are set in cvconfig.h. Most of them already were there, but were nonfunctional.
|
Vadim, Could you please look at the pull request from Roman? |
Contributor
|
that's really big patch affecting the whole library; hopefully, everything's done right there |
Contributor
|
👍 |
Author
|
I'm going to postpone applying this until we resolve the cvconfig.h-in-ts.hpp problem. |
This file contains hidden or 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
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.
This deletes macros that are always set or always unset or are unused, fixes a few macros that are set via
add_definitionsinstead of the config file, and adds a couple of new ones.