summaryrefslogtreecommitdiff
path: root/src/lib/efl/config.h.cmake
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@profusion.mobi>2017-01-23 23:55:33 -0200
committerGustavo Sverzut Barbieri <barbieri@profusion.mobi>2017-01-23 23:55:33 -0200
commitfa92926469881cdff7eda4627747fc964c2fa1a4 (patch)
tree9f2b5f016bef28ea01a1eabf05b127c899086eac /src/lib/efl/config.h.cmake
parentff0d88b7bae8fa14140210c5161beb944828bab5 (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 'src/lib/efl/config.h.cmake')
-rw-r--r--src/lib/efl/config.h.cmake24
1 files changed, 1 insertions, 23 deletions
diff --git a/src/lib/efl/config.h.cmake b/src/lib/efl/config.h.cmake
index 47ceb53a8c..35ab3c3ac3 100644
--- a/src/lib/efl/config.h.cmake
+++ b/src/lib/efl/config.h.cmake
@@ -3,22 +3,7 @@
3 3
4#define _GNU_SOURCE 4#define _GNU_SOURCE
5 5
6#include "config_headers.h" 6#include "config_gen.h"
7
8#define VMAJ @PROJECT_VERSION_MAJOR@
9#define VMIN @PROJECT_VERSION_MINOR@
10#define VMIC @PROJECT_VERSION_PATCH@
11#define VREV @PROJECT_VERSION_TWEAK@
12
13#cmakedefine NVALGRIND 1
14
15#cmakedefine EINA_STATIC_BUILD_CHAINED_POOL 1
16#cmakedefine EINA_STATIC_BUILD_ONE_BIG 1
17#cmakedefine EINA_STATIC_BUILD_PASS_THROUGH 1
18
19#define MODULE_ARCH "v-@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@"
20#define SHARED_LIB_SUFFIX "@CMAKE_SHARED_LIBRARY_SUFFIX@"
21#define EXEEXT "@CMAKE_EXECUTABLE_SUFFIX@"
22 7
23#if defined (HAVE_LISTXATTR) && defined (HAVE_SETXATTR) && defined (HAVE_GETXATTR) 8#if defined (HAVE_LISTXATTR) && defined (HAVE_SETXATTR) && defined (HAVE_GETXATTR)
24#define HAVE_XATTR 9#define HAVE_XATTR
@@ -27,11 +12,4 @@
27//for now statically define that to one 12//for now statically define that to one
28#define STRERROR_R_CHAR_P 1 13#define STRERROR_R_CHAR_P 1
29 14
30#cmakedefine EFL_ALWAYS_INLINE @EFL_ALWAYS_INLINE@
31#cmakedefine EFL_HAVE_OSX_SPINLOCK 1
32#cmakedefine EFL_HAVE_POSIX_THREADS_SPINLOCK 1
33#cmakedefine EFL_HAVE_THREADS 1
34
35#cmakedefine HAVE_EO_ID
36
37#endif 15#endif