Title: [172499] trunk/Source
- Revision
- 172499
- Author
- [email protected]
- Date
- 2014-08-12 15:43:19 -0700 (Tue, 12 Aug 2014)
Log Message
Generate header detection headers for CMake on Windows.
https://bugs.webkit.org/show_bug.cgi?id=135807
Reviewed by Brent Fulgham.
Source/_javascript_Core:
* CMakeLists.txt:
Include the derived sources directory to find WTF/WTFHeaderDetection.h.
Source/WebCore:
* CMakeLists.txt:
* PlatformWin.cmake:
Generate and include a stub WebCoreHeaderDetection.h.
Source/WTF:
* wtf/CMakeLists.txt:
* wtf/PlatformWin.cmake:
Generate and include a stub WTFHeaderDetection.h.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (172498 => 172499)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2014-08-12 22:42:41 UTC (rev 172498)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2014-08-12 22:43:19 UTC (rev 172499)
@@ -27,6 +27,7 @@
"${_javascript_CORE_DIR}/tools"
"${_javascript_CORE_DIR}/yarr"
"${WTF_DIR}"
+ "${DERIVED_SOURCES_DIR}"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders"
"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
Modified: trunk/Source/_javascript_Core/ChangeLog (172498 => 172499)
--- trunk/Source/_javascript_Core/ChangeLog 2014-08-12 22:42:41 UTC (rev 172498)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-08-12 22:43:19 UTC (rev 172499)
@@ -1,3 +1,13 @@
+2014-08-12 Alex Christensen <[email protected]>
+
+ Generate header detection headers for CMake on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=135807
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ Include the derived sources directory to find WTF/WTFHeaderDetection.h.
+
2014-08-11 Andy Estes <[email protected]>
[iOS] Get rid of iOS.xcconfig
Modified: trunk/Source/WTF/ChangeLog (172498 => 172499)
--- trunk/Source/WTF/ChangeLog 2014-08-12 22:42:41 UTC (rev 172498)
+++ trunk/Source/WTF/ChangeLog 2014-08-12 22:43:19 UTC (rev 172499)
@@ -1,3 +1,14 @@
+2014-08-12 Alex Christensen <[email protected]>
+
+ Generate header detection headers for CMake on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=135807
+
+ Reviewed by Brent Fulgham.
+
+ * wtf/CMakeLists.txt:
+ * wtf/PlatformWin.cmake:
+ Generate and include a stub WTFHeaderDetection.h.
+
2014-08-11 Andy Estes <[email protected]>
[iOS] Get rid of iOS.xcconfig
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (172498 => 172499)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2014-08-12 22:42:41 UTC (rev 172498)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2014-08-12 22:43:19 UTC (rev 172499)
@@ -218,6 +218,7 @@
"${WTF_DIR}/wtf/unicode"
"${THIRDPARTY_DIR}"
"${CMAKE_BINARY_DIR}"
+ "${DERIVED_SOURCES_DIR}"
)
set(WTF_LIBRARIES
Modified: trunk/Source/WTF/wtf/PlatformWin.cmake (172498 => 172499)
--- trunk/Source/WTF/wtf/PlatformWin.cmake 2014-08-12 22:42:41 UTC (rev 172498)
+++ trunk/Source/WTF/wtf/PlatformWin.cmake 2014-08-12 22:43:19 UTC (rev 172499)
@@ -14,3 +14,15 @@
winmm
)
endif ()
+
+list(APPEND WTF_HEADERS
+ "${DERIVED_SOURCES_WTF_DIR}/WTFHeaderDetection.h"
+)
+
+# FIXME: This should run testOSXLevel.cmd if it is available.
+# https://bugs.webkit.org/show_bug.cgi?id=135861
+add_custom_command(
+ OUTPUT "${DERIVED_SOURCES_WTF_DIR}/WTFHeaderDetection.h"
+ WORKING_DIRECTORY "${DERIVED_SOURCES_WTF_DIR}"
+ COMMAND echo /* No Legible Output Support Found */ > WTFHeaderDetection.h
+ VERBATIM)
Modified: trunk/Source/WebCore/CMakeLists.txt (172498 => 172499)
--- trunk/Source/WebCore/CMakeLists.txt 2014-08-12 22:42:41 UTC (rev 172498)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-08-12 22:43:19 UTC (rev 172499)
@@ -121,6 +121,7 @@
"${_javascript_CORE_DIR}/runtime"
"${_javascript_CORE_DIR}/yarr"
"${WTF_DIR}"
+ "${DERIVED_SOURCES_DIR}"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders"
"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
Modified: trunk/Source/WebCore/ChangeLog (172498 => 172499)
--- trunk/Source/WebCore/ChangeLog 2014-08-12 22:42:41 UTC (rev 172498)
+++ trunk/Source/WebCore/ChangeLog 2014-08-12 22:43:19 UTC (rev 172499)
@@ -1,3 +1,14 @@
+2014-08-12 Alex Christensen <[email protected]>
+
+ Generate header detection headers for CMake on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=135807
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ * PlatformWin.cmake:
+ Generate and include a stub WebCoreHeaderDetection.h.
+
2014-08-12 Renata Hodovan <[email protected]>
Make sure that begin time cannot be greater than SMILTime::indefiniteValue unintentionally.
Modified: trunk/Source/WebCore/PlatformWin.cmake (172498 => 172499)
--- trunk/Source/WebCore/PlatformWin.cmake 2014-08-12 22:42:41 UTC (rev 172498)
+++ trunk/Source/WebCore/PlatformWin.cmake 2014-08-12 22:43:19 UTC (rev 172499)
@@ -85,3 +85,15 @@
plugins/PluginViewNone.cpp
)
endif ()
+
+list(APPEND WebCore_SOURCES
+ "${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreHeaderDetection.h"
+)
+
+# FIXME: This should test if AVF headers are available.
+# https://bugs.webkit.org/show_bug.cgi?id=135861
+add_custom_command(
+ OUTPUT "${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreHeaderDetection.h"
+ WORKING_DIRECTORY "${DERIVED_SOURCES_WEBCORE_DIR}"
+ COMMAND echo /* Identifying AVFoundation Support */ > WebCoreHeaderDetection.h
+ VERBATIM)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
