Skip to content

Clean up cvconfig.h.tmpl#1110

Merged
opencv-pushbot merged 10 commits intoopencv:2.4from
SpecLad:config-cleanup
Jul 30, 2013
Merged

Clean up cvconfig.h.tmpl#1110
opencv-pushbot merged 10 commits intoopencv:2.4from
SpecLad:config-cleanup

Conversation

@SpecLad
Copy link
Copy Markdown

@SpecLad SpecLad commented Jul 11, 2013

This deletes macros that are always set or always unset or are unused, fixes a few macros that are set via add_definitions instead of the config file, and adds a couple of new ones.

Roman Donchenko 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.
@ghost ghost assigned vpisarev Jul 11, 2013
@ghost
Copy link
Copy Markdown

ghost commented Jul 11, 2013

Vadim,

Could you please look at the pull request from Roman?

@vpisarev
Copy link
Copy Markdown
Contributor

that's really big patch affecting the whole library; hopefully, everything's done right there

@vpisarev
Copy link
Copy Markdown
Contributor

👍

@SpecLad
Copy link
Copy Markdown
Author

SpecLad commented Jul 25, 2013

I'm going to postpone applying this until we resolve the cvconfig.h-in-ts.hpp problem.

apavlenko pushed a commit that referenced this pull request Jul 30, 2013
@opencv-pushbot opencv-pushbot merged commit 0b4d0a8 into opencv:2.4 Jul 30, 2013
@SpecLad SpecLad mentioned this pull request Aug 6, 2013
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.

3 participants