Generate header detection headers for CMake on Windows.

https://bugs.webkit.org/show_bug.cgi?id=135807

Reviewed by Brent Fulgham.

Source/JavaScriptCore:

* 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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@172499 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
index 571f138..ec0c8bb 100644 (file)
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
@@ -27,6 +27,7 @@ set(JavaScriptCore_INCLUDE_DIRECTORIES
     "${JAVASCRIPTCORE_DIR}/tools"
     "${JAVASCRIPTCORE_DIR}/yarr"
     "${WTF_DIR}"
+    "${DERIVED_SOURCES_DIR}"
     "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
     "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
     "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index f5e4d80..f792e00 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2014-08-12  Alex Christensen  <achristensen@webkit.org>
+
+        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  <aestes@apple.com>
 
         [iOS] Get rid of iOS.xcconfig

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 7ee301b..e1f299b 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,14 @@
+2014-08-12  Alex Christensen  <achristensen@webkit.org>
+
+        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  <aestes@apple.com>
 
         [iOS] Get rid of iOS.xcconfig

diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
index 7155aed..f5040f9 100644 (file)
--- a/Source/WTF/wtf/CMakeLists.txt
+++ b/Source/WTF/wtf/CMakeLists.txt
@@ -218,6 +218,7 @@ set(WTF_INCLUDE_DIRECTORIES
     "${WTF_DIR}/wtf/unicode"
     "${THIRDPARTY_DIR}"
     "${CMAKE_BINARY_DIR}"
+    "${DERIVED_SOURCES_DIR}"
 )
 
 set(WTF_LIBRARIES

diff --git a/Source/WTF/wtf/PlatformWin.cmake b/Source/WTF/wtf/PlatformWin.cmake
index 8834d25..cb2c526 100644 (file)
--- a/Source/WTF/wtf/PlatformWin.cmake
+++ b/Source/WTF/wtf/PlatformWin.cmake
@@ -14,3 +14,15 @@ else ()
         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)

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index f8ade84..d30b701 100644 (file)
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -121,6 +121,7 @@ set(WebCore_INCLUDE_DIRECTORIES
     "${JAVASCRIPTCORE_DIR}/runtime"
     "${JAVASCRIPTCORE_DIR}/yarr"
     "${WTF_DIR}"
+    "${DERIVED_SOURCES_DIR}"
     "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
     "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
     "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 72f44f0..74d9ed3 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2014-08-12  Alex Christensen  <achristensen@webkit.org>
+
+        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  <rhodovan.u-szeged@partner.samsung.com>
 
         Make sure that begin time cannot be greater than SMILTime::indefiniteValue unintentionally.

diff --git a/Source/WebCore/PlatformWin.cmake b/Source/WebCore/PlatformWin.cmake
index c876805..4b6a1ee 100644 (file)
--- a/Source/WebCore/PlatformWin.cmake
+++ b/Source/WebCore/PlatformWin.cmake
@@ -85,3 +85,15 @@ else ()
         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)