Title: [206458] trunk
- Revision
- 206458
- Author
- commit-qu...@webkit.org
- Date
- 2016-09-27 13:30:09 -0700 (Tue, 27 Sep 2016)
Log Message
[CMake] Use CMake to determine HAVE_* defines
https://bugs.webkit.org/show_bug.cgi?id=162368
Patch by Don Olmstead <don.olmst...@am.sony.com> on 2016-09-27
Reviewed by Alex Christensen.
.:
* Source/cmake/OptionsCommon.cmake:
Source/WTF:
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/ChangeLog (206457 => 206458)
--- trunk/ChangeLog 2016-09-27 20:07:15 UTC (rev 206457)
+++ trunk/ChangeLog 2016-09-27 20:30:09 UTC (rev 206458)
@@ -1,3 +1,12 @@
+2016-09-27 Don Olmstead <don.olmst...@am.sony.com>
+
+ [CMake] Use CMake to determine HAVE_* defines
+ https://bugs.webkit.org/show_bug.cgi?id=162368
+
+ Reviewed by Alex Christensen.
+
+ * Source/cmake/OptionsCommon.cmake:
+
2016-09-27 Konstantin Tokarev <annu...@yandex.ru>
[cmake] Simplify Clang checks and prepare for compiler ID split
Modified: trunk/Source/WTF/ChangeLog (206457 => 206458)
--- trunk/Source/WTF/ChangeLog 2016-09-27 20:07:15 UTC (rev 206457)
+++ trunk/Source/WTF/ChangeLog 2016-09-27 20:30:09 UTC (rev 206458)
@@ -1,3 +1,12 @@
+2016-09-27 Don Olmstead <don.olmst...@am.sony.com>
+
+ [CMake] Use CMake to determine HAVE_* defines
+ https://bugs.webkit.org/show_bug.cgi?id=162368
+
+ Reviewed by Alex Christensen.
+
+ * wtf/Platform.h:
+
2016-09-20 Anders Carlsson <ander...@apple.com>
PlatformEvent::m_modifiers should be an OptionSet
Modified: trunk/Source/WTF/wtf/Platform.h (206457 => 206458)
--- trunk/Source/WTF/wtf/Platform.h 2016-09-27 20:07:15 UTC (rev 206457)
+++ trunk/Source/WTF/wtf/Platform.h 2016-09-27 20:30:09 UTC (rev 206458)
@@ -605,21 +605,26 @@
#endif
#endif /* !defined(HAVE_ACCESSIBILITY) */
-#if OS(UNIX)
+/* FIXME: Remove after CMake build enabled on Darwin */
+#if OS(DARWIN)
#define HAVE_ERRNO_H 1
#define HAVE_LANGINFO_H 1
#define HAVE_MMAP 1
#define HAVE_SIGNAL_H 1
+#define HAVE_STAT_BIRTHTIME 1
#define HAVE_STRINGS_H 1
+#define HAVE_STRNSTR 1
#define HAVE_SYS_PARAM_H 1
#define HAVE_SYS_TIME_H 1
+#define HAVE_TM_GMTOFF 1
+#define HAVE_TM_ZONE 1
+#define HAVE_TIMEGM 1
+#endif /* OS(DARWIN) */
+
+#if OS(UNIX)
#define USE_PTHREADS 1
#endif /* OS(UNIX) */
-#if (OS(FREEBSD) || OS(OPENBSD)) && !defined(__GLIBC__)
-#define HAVE_PTHREAD_NP_H 1
-#endif
-
#if !defined(HAVE_VASPRINTF)
#if !COMPILER(MSVC) && !COMPILER(MINGW)
#define HAVE_VASPRINTF 1
@@ -626,24 +631,7 @@
#endif
#endif
-#if !defined(HAVE_STRNSTR)
-#if OS(DARWIN) || (OS(FREEBSD) && !defined(__GLIBC__))
-#define HAVE_STRNSTR 1
-#endif
-#endif
-
-#if (OS(DARWIN) || OS(FREEBSD) || OS(NETBSD)) && !defined(__GLIBC__)
-#define HAVE_STAT_BIRTHTIME 1
-#endif
-
-#if !OS(WINDOWS) && !OS(SOLARIS)
-#define HAVE_TM_GMTOFF 1
-#define HAVE_TM_ZONE 1
-#define HAVE_TIMEGM 1
-#endif
-
#if OS(DARWIN)
-
#define HAVE_DISPATCH_H 1
#define HAVE_MADV_FREE 1
#define HAVE_MADV_FREE_REUSE 1
@@ -662,18 +650,6 @@
#endif /* OS(DARWIN) */
-#if OS(WINDOWS)
-
-#define HAVE_SYS_TIMEB_H 1
-#define HAVE_ALIGNED_MALLOC 1
-#define HAVE_ISDEBUGGERPRESENT 1
-
-#endif
-
-#if OS(WINDOWS)
-#define HAVE_VIRTUALALLOC 1
-#endif
-
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
#define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
#endif
Modified: trunk/Source/cmake/OptionsCommon.cmake (206457 => 206458)
--- trunk/Source/cmake/OptionsCommon.cmake 2016-09-27 20:07:15 UTC (rev 206457)
+++ trunk/Source/cmake/OptionsCommon.cmake 2016-09-27 20:30:09 UTC (rev 206458)
@@ -203,8 +203,58 @@
set(CMAKE_NINJA_FORCE_RESPONSE_FILE 1)
endif ()
+# Macros for determining HAVE values.
+include(CheckIncludeFile)
+include(CheckFunctionExists)
+include(CheckSymbolExists)
+include(CheckStructHasMember)
+
+macro(_HAVE_CHECK_INCLUDE _variable _header)
+ check_include_file(${_header} ${_variable}_value)
+ SET_AND_EXPOSE_TO_BUILD(${_variable} ${_variable}_value)
+endmacro()
+
+macro(_HAVE_CHECK_FUNCTION _variable _function)
+ check_function_exists(${_function} ${_variable}_value)
+ SET_AND_EXPOSE_TO_BUILD(${_variable} ${_variable}_value)
+endmacro()
+
+macro(_HAVE_CHECK_SYMBOL _variable _symbol _header)
+ check_symbol_exists(${_symbol} ${_header} ${_variable}_value)
+ SET_AND_EXPOSE_TO_BUILD(${_variable} ${_variable}_value)
+endmacro()
+
+macro(_HAVE_CHECK_STRUCT _variable _struct _member _header)
+ check_struct_has_member(${_struct} ${_member} ${_header} ${_variable}_value)
+ SET_AND_EXPOSE_TO_BUILD(${_variable} ${_variable}_value)
+endmacro()
+
# Check whether features.h header exists.
# Including glibc's one defines __GLIBC__, that is used in Platform.h
-include(CheckIncludeFiles)
-check_include_files(features.h HAVE_FEATURES_H)
-SET_AND_EXPOSE_TO_BUILD(HAVE_FEATURES_H ${HAVE_FEATURES_H})
+_HAVE_CHECK_INCLUDE(HAVE_FEATURES_H features.h)
+
+# Check for headers
+_HAVE_CHECK_INCLUDE(HAVE_ERRNO_H errno.h)
+_HAVE_CHECK_INCLUDE(HAVE_LANGINFO_H langinfo.h)
+_HAVE_CHECK_INCLUDE(HAVE_MMAP sys/mman.h)
+_HAVE_CHECK_INCLUDE(HAVE_PTHREAD_NP_H pthread_np.h)
+_HAVE_CHECK_INCLUDE(HAVE_STRINGS_H strings.h)
+_HAVE_CHECK_INCLUDE(HAVE_SYS_PARAM_H sys/param.h)
+_HAVE_CHECK_INCLUDE(HAVE_SYS_TIME_H sys/time.h)
+_HAVE_CHECK_INCLUDE(HAVE_SYS_TIMEB_H sys/timeb.h)
+
+# Check for functions
+_HAVE_CHECK_FUNCTION(HAVE_ALIGNED_MALLOC _aligned_malloc)
+_HAVE_CHECK_FUNCTION(HAVE_ISDEBUGGERPRESENT IsDebuggerPresent)
+_HAVE_CHECK_FUNCTION(HAVE_STRNSTR strnstr)
+_HAVE_CHECK_FUNCTION(HAVE_TIMEGM timegm)
+_HAVE_CHECK_FUNCTION(HAVE_VASPRINTF vasprintf)
+
+# Check for symbols
+# Windows has signal.h but is missing symbols that are used in calls to signal.
+_HAVE_CHECK_SYMBOL(HAVE_SIGNAL_H SIGTRAP signal.h)
+
+# Check for struct members
+_HAVE_CHECK_STRUCT(HAVE_STAT_BIRTHTIME "struct stat" st_birthtime sys/stat.h)
+_HAVE_CHECK_STRUCT(HAVE_TM_GMTOFF "struct tm" tm_gmtoff time.h)
+_HAVE_CHECK_STRUCT(HAVE_TM_ZONE "struct tm" tm_zone time.h)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
