diff options
author | Gustavo Sverzut Barbieri <barbieri@profusion.mobi> | 2017-01-23 23:55:33 -0200 |
---|---|---|
committer | Gustavo Sverzut Barbieri <barbieri@profusion.mobi> | 2017-01-23 23:55:33 -0200 |
commit | fa92926469881cdff7eda4627747fc964c2fa1a4 (patch) | |
tree | 9f2b5f016bef28ea01a1eabf05b127c899086eac /src/lib/efl/Efl_Config.h.cmake | |
parent | ff0d88b7bae8fa14140210c5161beb944828bab5 (diff) |
cmake: major rework of check and pkg-config dependencies.
make FUNC_CHECK(), TYPE_CHECK() and HEADER_CHECK() more general and
they can be set to a scope, like "eina", then all symbols are prefixed
with that. The scope is created with CHECK_INIT(), and
EFL_HEADER_CHECKS_FINALIZE() will finish that.
This makes it possible for cmake/config/eina.cmake +
cmake/post/eina.cmake to add stuff to the generated file, better than
hand edit the template.
CHECK_APPEND_DEFINE(name val) is now the base to add symbols to the
generated file in the current scope.
Then convert cmake/config/eina.cmake to use that and match the
autotools values (were a bit off).
This exposed enabling valgrind was broken due incorrect pkg-config
usage with cmake (it's not obvious), it was using just the libraries,
while LDFLAGS are needed to get -L/usr/lib/valgrind. Then also convert
to CFLAGS provided by pkg-config and make that automatic for
PKG_CONFIG_REQUIRES and PKG_CONFIG_REQUIRES_PRIVATE.
Also, eina-mempool modules use valgrind and must use that now that's
propagating correctly.
Diffstat (limited to '')
-rw-r--r-- | src/lib/efl/Efl_Config.h.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/efl/Efl_Config.h.cmake b/src/lib/efl/Efl_Config.h.cmake index e1c199ce80..a99d153f86 100644 --- a/src/lib/efl/Efl_Config.h.cmake +++ b/src/lib/efl/Efl_Config.h.cmake | |||
@@ -15,7 +15,7 @@ | |||
15 | and require an explicit request to get it. */ | 15 | and require an explicit request to get it. */ |
16 | #endif | 16 | #endif |
17 | 17 | ||
18 | #define EFL_VERSION_MAJOR @EFL_VERSION_MAJOR@ | 18 | #define EFL_VERSION_MAJOR @PROJECT_VERSION_MAJOR@ |
19 | #define EFL_VERSION_MINOR @EFL_VERSION_MINOR@ | 19 | #define EFL_VERSION_MINOR @PROJECT_VERSION_MINOR@ |
20 | #define EFL_BUILD_ID "@EFL_BUILD_ID@" | 20 | #define EFL_BUILD_ID "@PROJECT_VERSION_TWEAK@" |
21 | #endif | 21 | #endif |