diff options
| author | Gustavo Sverzut Barbieri <barbieri@profusion.mobi> | 2017-02-03 12:17:05 -0200 |
|---|---|---|
| committer | Gustavo Sverzut Barbieri <barbieri@profusion.mobi> | 2017-02-03 12:36:50 -0200 |
| commit | 3cc60ce5f388e7edfc2d07bbdf95d09a16b673b7 (patch) | |
| tree | a9df5338145ef20060a2a419e016da0cb977fc87 | |
| parent | 8dc853f2300ea70a9116325db773da22c6343c3c (diff) | |
| download | efl-3cc60ce5f388e7edfc2d07bbdf95d09a16b673b7.tar.gz | |
cmake: sync EFL_EO_API_SUPPORT definition with autotools.
in autotools we always define that symbol in config.h (thus now done
in common.cmake), while the Efl_Config.h that is generated never have
it, what's left is to enable/disable the legacy and beta APIs.
This fixes building eldbus_suite with cmake.
| -rw-r--r-- | cmake/config/common.cmake | 1 | ||||
| -rw-r--r-- | src/lib/efl/Efl_Config.h.cmake | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cmake/config/common.cmake b/cmake/config/common.cmake index 41d480d2d0..a4257ebddb 100644 --- a/cmake/config/common.cmake +++ b/cmake/config/common.cmake @@ -101,6 +101,7 @@ TYPE_CHECK(siginfo_t INCLUDE_FILES signal.h) # or is pkg-config enough these days? pkg_check_modules(UNWIND libunwind libunwind-generic) +CHECK_APPEND_DEFINE(EFL_EO_API_SUPPORT 1) CHECK_APPEND_DEFINE(EFL_BETA_API_SUPPORT 1) if(CMAKE_THREAD_LIBS_INIT) set(EFL_HAVE_THREADS 1) diff --git a/src/lib/efl/Efl_Config.h.cmake b/src/lib/efl/Efl_Config.h.cmake index a99d153f86..4f7a03ac1f 100644 --- a/src/lib/efl/Efl_Config.h.cmake +++ b/src/lib/efl/Efl_Config.h.cmake @@ -8,11 +8,11 @@ #ifndef EFL_API_OVERRIDE #cmakedefine EFL_API_LEGACY_DEF -#cmakedefine EFL_EO_API_SUPPORT #cmakedefine EFL_BETA_API_SUPPORT /* You can't disable Eo API anymore as EFL use it everywhere internally and we don't want to expose it publicly just yet, so keep it hidden and require an explicit request to get it. */ +/* #define EFL_EO_API_SUPPORT */ #endif #define EFL_VERSION_MAJOR @PROJECT_VERSION_MAJOR@ |