Title: [201398] trunk/Source
- Revision
- 201398
- Author
- [email protected]
- Date
- 2016-05-25 12:49:46 -0700 (Wed, 25 May 2016)
Log Message
Fix CMake build.
* PlatformMac.cmake:
Source/WebCore:
c++14 is needed since r201255.
ColorSync (in ApplicationServices) is needed since r201065.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (201397 => 201398)
--- trunk/Source/WebCore/ChangeLog 2016-05-25 19:41:34 UTC (rev 201397)
+++ trunk/Source/WebCore/ChangeLog 2016-05-25 19:49:46 UTC (rev 201398)
@@ -1,3 +1,11 @@
+2016-05-25 Alex Christensen <[email protected]>
+
+ Fix CMake build.
+
+ * PlatformMac.cmake:
+ c++14 is needed since r201255.
+ ColorSync (in ApplicationServices) is needed since r201065.
+
2016-05-25 Zalan Bujtas <[email protected]>
Swap search field's cancel and result button for RTL content.
Modified: trunk/Source/WebCore/PlatformMac.cmake (201397 => 201398)
--- trunk/Source/WebCore/PlatformMac.cmake 2016-05-25 19:41:34 UTC (rev 201397)
+++ trunk/Source/WebCore/PlatformMac.cmake 2016-05-25 19:49:46 UTC (rev 201398)
@@ -10,6 +10,7 @@
link_directories(../../WebKitLibraries)
find_library(ACCELERATE_LIBRARY accelerate)
+find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
find_library(AVFOUNDATION_LIBRARY AVFoundation)
find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
find_library(AUDIOUNIT_LIBRARY AudioUnit)
@@ -52,6 +53,7 @@
add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
add_definitions(-iframework ${AVFOUNDATION_LIBRARY}/Versions/Current/Frameworks)
+add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
find_library(DATADETECTORSCORE_FRAMEWORK DataDetectorsCore HINTS /System/Library/PrivateFrameworks)
if (NOT DATADETECTORSCORE_FRAMEWORK-NOTFOUND)
Modified: trunk/Source/WebKit/ChangeLog (201397 => 201398)
--- trunk/Source/WebKit/ChangeLog 2016-05-25 19:41:34 UTC (rev 201397)
+++ trunk/Source/WebKit/ChangeLog 2016-05-25 19:49:46 UTC (rev 201398)
@@ -1,3 +1,9 @@
+2016-05-25 Alex Christensen <[email protected]>
+
+ Fix CMake build.
+
+ * PlatformMac.cmake:
+
2016-05-18 Brady Eidson <[email protected]>
Modern IDB: Make TestRunner.clearAllDatabases also delete IndexedDB databases (once doing so is supported).
Modified: trunk/Source/WebKit/PlatformMac.cmake (201397 => 201398)
--- trunk/Source/WebKit/PlatformMac.cmake 2016-05-25 19:41:34 UTC (rev 201397)
+++ trunk/Source/WebKit/PlatformMac.cmake 2016-05-25 19:49:46 UTC (rev 201398)
@@ -1,5 +1,7 @@
+find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
find_library(QUARTZ_LIBRARY Quartz)
add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
+add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
link_directories(../../WebKitLibraries)
list(APPEND WebKit_INCLUDE_DIRECTORIES
@@ -313,7 +315,7 @@
foreach (_file ${WebKit_SOURCES})
list(FIND C99_FILES ${_file} _c99_index)
if (${_c99_index} EQUAL -1)
- set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-ObjC++ -std=c++11")
+ set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-ObjC++ -std=c++14")
else ()
set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS -std=c99)
endif ()
Modified: trunk/Source/WebKit2/ChangeLog (201397 => 201398)
--- trunk/Source/WebKit2/ChangeLog 2016-05-25 19:41:34 UTC (rev 201397)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-25 19:49:46 UTC (rev 201398)
@@ -1,3 +1,9 @@
+2016-05-25 Alex Christensen <[email protected]>
+
+ Fix CMake build.
+
+ * PlatformMac.cmake:
+
2016-05-25 Chris Dumez <[email protected]>
Simplify a few lambda captures in the network cache code
Modified: trunk/Source/WebKit2/PlatformMac.cmake (201397 => 201398)
--- trunk/Source/WebKit2/PlatformMac.cmake 2016-05-25 19:41:34 UTC (rev 201397)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2016-05-25 19:49:46 UTC (rev 201398)
@@ -1,17 +1,18 @@
-add_definitions("-ObjC++ -std=c++11")
+add_definitions("-ObjC++ -std=c++14")
link_directories(../../WebKitLibraries)
-find_library(APPLICATION_SERVICES_LIBRARY ApplicationServices)
+find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
find_library(CARBON_LIBRARY Carbon)
find_library(QUARTZ_LIBRARY Quartz)
find_library(AVFOUNDATION_LIBRARY AVFoundation)
find_library(AVFAUDIO_LIBRARY AVFAudio HINTS ${AVFOUNDATION_LIBRARY}/Versions/*/Frameworks)
add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
add_definitions(-iframework ${CARBON_LIBRARY}/Frameworks)
+add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
add_definitions(-DWK_XPC_SERVICE_SUFFIX=".Development")
list(APPEND WebKit2_LIBRARIES
PRIVATE WebKit
- ${APPLICATION_SERVICES_LIBRARY}
+ ${APPLICATIONSERVICES_LIBRARY}
)
if (NOT AVFAUDIO_LIBRARY-NOTFOUND)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
