Diff
Modified: trunk/CMakeLists.txt (219579 => 219580)
--- trunk/CMakeLists.txt 2017-07-17 22:49:02 UTC (rev 219579)
+++ trunk/CMakeLists.txt 2017-07-17 22:50:40 UTC (rev 219580)
@@ -150,11 +150,6 @@
endif ()
# -----------------------------------------------------------------------------
-# Define packaging
-# -----------------------------------------------------------------------------
-include(WebKitPackaging)
-
-# -----------------------------------------------------------------------------
# Add module directories
# -----------------------------------------------------------------------------
add_subdirectory(Source)
Modified: trunk/ChangeLog (219579 => 219580)
--- trunk/ChangeLog 2017-07-17 22:49:02 UTC (rev 219579)
+++ trunk/ChangeLog 2017-07-17 22:50:40 UTC (rev 219580)
@@ -1,5 +1,17 @@
2017-07-17 Michael Catanzaro <mcatanz...@igalia.com>
+ [CMake] Include most CMake modules from WebKitCommon.cmake
+ https://bugs.webkit.org/show_bug.cgi?id=174546
+
+ Reviewed by Konstantin Tokarev.
+
+ * CMakeLists.txt:
+ * Source/cmake/OptionsCommon.cmake:
+ * Source/cmake/WebKitCommon.cmake:
+ * Source/cmake/WebKitMacros.cmake:
+
+2017-07-17 Michael Catanzaro <mcatanz...@igalia.com>
+
[CMake] Macros in WebKitMacros.cmake should be prefixed with WEBKIT_ namespace
https://bugs.webkit.org/show_bug.cgi?id=174547
Modified: trunk/Source/WebCore/ChangeLog (219579 => 219580)
--- trunk/Source/WebCore/ChangeLog 2017-07-17 22:49:02 UTC (rev 219579)
+++ trunk/Source/WebCore/ChangeLog 2017-07-17 22:50:40 UTC (rev 219580)
@@ -1,5 +1,14 @@
2017-07-17 Michael Catanzaro <mcatanz...@igalia.com>
+ [CMake] Include most CMake modules from WebKitCommon.cmake
+ https://bugs.webkit.org/show_bug.cgi?id=174546
+
+ Reviewed by Konstantin Tokarev.
+
+ * WebCoreMacros.cmake:
+
+2017-07-17 Michael Catanzaro <mcatanz...@igalia.com>
+
[CMake] Macros in WebKitMacros.cmake should be prefixed with WEBKIT_ namespace
https://bugs.webkit.org/show_bug.cgi?id=174547
Modified: trunk/Source/WebCore/WebCoreMacros.cmake (219579 => 219580)
--- trunk/Source/WebCore/WebCoreMacros.cmake 2017-07-17 22:49:02 UTC (rev 219579)
+++ trunk/Source/WebCore/WebCoreMacros.cmake 2017-07-17 22:50:40 UTC (rev 219580)
@@ -117,6 +117,7 @@
if (arg_SUPPLEMENTAL_DEPFILE)
list(APPEND args --supplementalDependencyFile ${arg_SUPPLEMENTAL_DEPFILE})
endif ()
+ ProcessorCount(PROCESSOR_COUNT)
if (PROCESSOR_COUNT)
list(APPEND args --numOfJobs ${PROCESSOR_COUNT})
endif ()
Modified: trunk/Source/WebKit/CMakeLists.txt (219579 => 219580)
--- trunk/Source/WebKit/CMakeLists.txt 2017-07-17 22:49:02 UTC (rev 219579)
+++ trunk/Source/WebKit/CMakeLists.txt 2017-07-17 22:50:40 UTC (rev 219580)
@@ -1,5 +1,4 @@
-include(CheckCXXSourceCompiles)
-include(CheckFunctionExists)
+include(WebKitCommon)
set_property(DIRECTORY . PROPERTY FOLDER "WebKit2")
Modified: trunk/Source/WebKit/ChangeLog (219579 => 219580)
--- trunk/Source/WebKit/ChangeLog 2017-07-17 22:49:02 UTC (rev 219579)
+++ trunk/Source/WebKit/ChangeLog 2017-07-17 22:50:40 UTC (rev 219580)
@@ -1,5 +1,14 @@
2017-07-17 Michael Catanzaro <mcatanz...@igalia.com>
+ [CMake] Include most CMake modules from WebKitCommon.cmake
+ https://bugs.webkit.org/show_bug.cgi?id=174546
+
+ Reviewed by Konstantin Tokarev.
+
+ * CMakeLists.txt:
+
+2017-07-17 Michael Catanzaro <mcatanz...@igalia.com>
+
[CMake] Macros in WebKitMacros.cmake should be prefixed with WEBKIT_ namespace
https://bugs.webkit.org/show_bug.cgi?id=174547
Modified: trunk/Source/cmake/OptionsCommon.cmake (219579 => 219580)
--- trunk/Source/cmake/OptionsCommon.cmake 2017-07-17 22:49:02 UTC (rev 219579)
+++ trunk/Source/cmake/OptionsCommon.cmake 2017-07-17 22:50:40 UTC (rev 219580)
@@ -127,7 +127,6 @@
if (NOT WTF_CPU_ARM64)
message(FATAL_ERROR "WTF_CPU_ARM64_CORTEXA53 set without WTF_CPU_ARM64")
endif ()
- include(TestCXXAcceptsFlag)
CHECK_CXX_ACCEPTS_FLAG(-mfix-cortex-a53-835769 CXX_ACCEPTS_MFIX_CORTEX_A53_835769)
if (CXX_ACCEPTS_MFIX_CORTEX_A53_835769)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfix-cortex-a53-835769")
@@ -148,7 +147,6 @@
int main() {}
")
- include(CheckCXXSourceCompiles)
CHECK_CXX_SOURCE_COMPILES("${ARM_THUMB2_TEST_SOURCE}" ARM_THUMB2_DETECTED)
if (NOT ARM_THUMB2_DETECTED)
set(ARM_TRADITIONAL_DETECTED TRUE)
@@ -158,7 +156,6 @@
endif ()
# Use ld.gold if it is available and isn't disabled explicitly
-include(CMakeDependentOption)
CMAKE_DEPENDENT_OPTION(USE_LD_GOLD "Use GNU gold linker" ON
"NOT CXX_ACCEPTS_MFIX_CORTEX_A53_835769;NOT ARM_TRADITIONAL_DETECTED;NOT WIN32;NOT APPLE" OFF)
if (USE_LD_GOLD)
@@ -174,7 +171,6 @@
set(ENABLE_DEBUG_FISSION_DEFAULT OFF)
if (USE_LD_GOLD AND CMAKE_BUILD_TYPE STREQUAL "Debug")
- include(TestCXXAcceptsFlag)
CHECK_CXX_ACCEPTS_FLAG(-gsplit-dwarf CXX_ACCEPTS_GSPLIT_DWARF)
if (CXX_ACCEPTS_GSPLIT_DWARF)
set(ENABLE_DEBUG_FISSION_DEFAULT ON)
@@ -235,12 +231,6 @@
endif ()
# Macros for determining HAVE values.
-include(CheckIncludeFile)
-include(CheckFunctionExists)
-include(CheckSymbolExists)
-include(CheckStructHasMember)
-include(CheckTypeSize)
-
macro(_HAVE_CHECK_INCLUDE _variable _header)
check_include_file(${_header} ${_variable}_value)
SET_AND_EXPOSE_TO_BUILD(${_variable} ${_variable}_value)
Modified: trunk/Source/cmake/WebKitCommon.cmake (219579 => 219580)
--- trunk/Source/cmake/WebKitCommon.cmake 2017-07-17 22:49:02 UTC (rev 219579)
+++ trunk/Source/cmake/WebKitCommon.cmake 2017-07-17 22:50:40 UTC (rev 219580)
@@ -36,6 +36,19 @@
# Helper macros and feature defines
# -----------------------------------------------------------------------------
+ # To prevent multiple inclusion, most modules should be included once here.
+ include(CheckCXXSourceCompiles)
+ include(CheckFunctionExists)
+ include(CheckIncludeFile)
+ include(CheckSymbolExists)
+ include(CheckStructHasMember)
+ include(CheckTypeSize)
+ include(CMakeDependentOption)
+ include(CMakeParseArguments)
+ include(ProcessorCount)
+ include(TestCXXAcceptsFlag)
+
+ include(WebKitPackaging)
include(WebKitMacros)
include(WebKitFS)
include(WebKitFeatures)
Modified: trunk/Source/cmake/WebKitMacros.cmake (219579 => 219580)
--- trunk/Source/cmake/WebKitMacros.cmake 2017-07-17 22:49:02 UTC (rev 219579)
+++ trunk/Source/cmake/WebKitMacros.cmake 2017-07-17 22:50:40 UTC (rev 219580)
@@ -2,10 +2,6 @@
# exclusively needed in only one subdirectory of Source (e.g. only needed by
# WebCore), then put it there instead.
-include(CMakeParseArguments)
-include(ProcessorCount)
-ProcessorCount(PROCESSOR_COUNT)
-
macro(WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS)
set(_file ${CMAKE_CURRENT_SOURCE_DIR}/Platform${PORT}.cmake)
if (EXISTS ${_file})
