barbieri pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4d21d6c56a697e0cfaa11cee5a6fb3f16739ddac
commit 4d21d6c56a697e0cfaa11cee5a6fb3f16739ddac
Author: Gustavo Sverzut Barbieri <barbi...@profusion.mobi>
Date: Wed Jan 25 13:03:52 2017 -0200
cmake/common: add missing checks for eina, simplify to one file.
Since the macros were moved to EflMacros.cmake, there is no reason to
keep CommonHeaderChecks.cmake anymore, put them all in
config/common.cmake
Keep the checks sorted so they're easy to organize.
Add missing check for prctl() and iconv() (which we were checking
iconv.h, but the code used '#if HAVE_ICONV').
---
cmake/config/common.cmake | 44 ++++++++++++++++++++++++++++++++--
cmake/helpers/CommonHeaderChecks.cmake | 36 ----------------------------
2 files changed, 42 insertions(+), 38 deletions(-)
diff --git a/cmake/config/common.cmake b/cmake/config/common.cmake
index b544ec5..25053f5 100644
--- a/cmake/config/common.cmake
+++ b/cmake/config/common.cmake
@@ -15,8 +15,48 @@ if(NOT EFL_EO_API_SUPPORT)
endif()
-#define all our header / function checks
-include(./CommonHeaderChecks)
+
+# BEGIN: HEADER, TYPE and FUNCTION CHECKS
+# KEEP EACH BLOCK SORTED
+
+HEADER_CHECK(asm/hwcap.h)
+HEADER_CHECK(dirent.h)
+HEADER_CHECK(execinfo.h)
+HEADER_CHECK(libunwind.h NAME HAVE_UNWIND)
+HEADER_CHECK(mcheck.h)
+HEADER_CHECK(stdlib.h)
+HEADER_CHECK(sys/auxv.h)
+HEADER_CHECK(sys/mman.h)
+HEADER_CHECK(sys/types.h)
+
+FUNC_CHECK(clock_gettime INCLUDE_FILES time.h)
+FUNC_CHECK(dirfd INCLUDE_FILES dirent.h sys/types.h)
+FUNC_CHECK(dladdr INCLUDE_FILES dlfcn.h LIBRARIES dl DEFINITIONS
"-D_GNU_SOURCE=1")
+FUNC_CHECK(dlopen INCLUDE_FILES dlfcn.h LIBRARIES dl)
+FUNC_CHECK(fchmod INCLUDE_FILES sys/stat.h)
+FUNC_CHECK(fcntl INCLUDE_FILES fcntl.h)
+FUNC_CHECK(fpathconf INCLUDE_FILES unistd.h)
+FUNC_CHECK(fstatat NAME HAVE_ATFILE_SOURCE INCLUDE_FILES sys/stat.h)
+FUNC_CHECK(geteuid INCLUDE_FILES unistd.h)
+FUNC_CHECK(getpagesize INCLUDE_FILES unistd.h)
+FUNC_CHECK(getuid INCLUDE_FILES unistd.h)
+FUNC_CHECK(getxattr INCLUDE_FILES sys/types.h sys/xattr.h)
+FUNC_CHECK(iconv INCLUDE_FILES iconv.h)
+FUNC_CHECK(listxattr INCLUDE_FILES sys/types.h sys/xattr.h)
+FUNC_CHECK(mmap INCLUDE_FILES sys/mman.h)
+FUNC_CHECK(mtrace INCLUDE_FILES mcheck.h)
+FUNC_CHECK(prctl INCLUDE_FILES sys/prctl.h)
+FUNC_CHECK(sched_getcpu INCLUDE_FILES sched.h DEFINITIONS "-D_GNU_SOURCE=1")
+FUNC_CHECK(setxattr INCLUDE_FILES sys/types.h sys/xattr.h)
+FUNC_CHECK(shm_open INCLUDE_FILES sys/mman.h sys/stat.h fcntl.h LIBRARIES rt)
+FUNC_CHECK(splice INCLUDE_FILES fcntl.h DEFINITIONS "-D_GNU_SOURCE=1")
+FUNC_CHECK(strerror_r INCLUDE_FILES string.h)
+FUNC_CHECK(strlcpy INCLUDE_FILES bsd/string.h)
+
+TYPE_CHECK(siginfo_t INCLUDE_FILES signal.h)
+
+# END: HEADER, TYPE and FUNCTION CHECKS
+
CHECK_APPEND_DEFINE(EFL_BETA_API_SUPPORT 1)
if(CMAKE_THREAD_LIBS_INIT)
diff --git a/cmake/helpers/CommonHeaderChecks.cmake
b/cmake/helpers/CommonHeaderChecks.cmake
deleted file mode 100644
index 593e0f3..0000000
--- a/cmake/helpers/CommonHeaderChecks.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-
-FUNC_CHECK(geteuid INCLUDE_FILES unistd.h)
-FUNC_CHECK(getuid INCLUDE_FILES unistd.h)
-FUNC_CHECK(getpagesize INCLUDE_FILES unistd.h)
-FUNC_CHECK(strlcpy INCLUDE_FILES bsd/string.h)
-FUNC_CHECK(mmap INCLUDE_FILES sys/mman.h)
-FUNC_CHECK(fchmod INCLUDE_FILES sys/stat.h)
-FUNC_CHECK(clock_gettime INCLUDE_FILES time.h)
-FUNC_CHECK(fstatat NAME HAVE_ATFILE_SOURCE INCLUDE_FILES sys/stat.h)
-FUNC_CHECK(dirfd INCLUDE_FILES dirent.h sys/types.h)
-FUNC_CHECK(fpathconf INCLUDE_FILES unistd.h)
-FUNC_CHECK(listxattr INCLUDE_FILES sys/types.h sys/xattr.h)
-FUNC_CHECK(setxattr INCLUDE_FILES sys/types.h sys/xattr.h)
-FUNC_CHECK(getxattr INCLUDE_FILES sys/types.h sys/xattr.h)
-FUNC_CHECK(dlopen INCLUDE_FILES dlfcn.h LIBRARIES dl)
-FUNC_CHECK(mtrace INCLUDE_FILES mcheck.h)
-FUNC_CHECK(strerror_r INCLUDE_FILES string.h)
-FUNC_CHECK(shm_open INCLUDE_FILES sys/mman.h sys/stat.h fcntl.h LIBRARIES rt)
-FUNC_CHECK(sched_getcpu INCLUDE_FILES sched.h DEFINITIONS "-D_GNU_SOURCE=1")
-FUNC_CHECK(splice INCLUDE_FILES fcntl.h DEFINITIONS "-D_GNU_SOURCE=1")
-FUNC_CHECK(fcntl INCLUDE_FILES fcntl.h)
-FUNC_CHECK(dladdr INCLUDE_FILES dlfcn.h LIBRARIES dl DEFINITIONS
"-D_GNU_SOURCE=1")
-
-TYPE_CHECK(siginfo_t INCLUDE_FILES signal.h)
-
-HEADER_CHECK(stdlib.h)
-HEADER_CHECK(sys/mman.h)
-HEADER_CHECK(dirent.h)
-HEADER_CHECK(iconv.h)
-HEADER_CHECK(sys/auxv.h)
-HEADER_CHECK(asm/hwcap.h)
-HEADER_CHECK(mcheck.h)
-HEADER_CHECK(sys/types.h)
-HEADER_CHECK(execinfo.h)
-HEADER_CHECK(libunwind.h NAME HAVE_UNWIND)
-
--
