Changeset 195242 in webkit

Timestamp:

Jan 18, 2016 5:23:08 PM (8 years ago)

Author:

Michael Catanzaro

Message:

[CMake] Duplicate attempts to find software during cmake stage
​https://bugs.webkit.org/show_bug.cgi?id=153211

Reviewed by Martin Robinson.

• CMakeLists.txt: Remove duplication of commands in WebKitCommon.cmake.
• Source/cmake/WebKitCommon.cmake: Guard the entire file so it runs only once.

Location:

trunk

Files:

• CMakeLists.txt (modified) (3 diffs)
• ChangeLog (modified) (1 diff)
• Source/cmake/WebKitCommon.cmake (modified) (1 diff)

trunk/CMakeLists.txt

@@ -16 +16 @@
     set(ENABLE_TOOLS ON)
 endif ()
-
-include(WebKitMacros)
-include(WebKitFS)
-include(WebKitHelpers)
-include(WebKitFeatures)
 
 # -----------------------------------------------------------------------------
@@ -111 +106 @@
 
 # -----------------------------------------------------------------------------
-# Common options
+# Common configuration
 #------------------------------------------------------------------------------
-include(OptionsCommon)
+include(WebKitCommon)
+
+# -----------------------------------------------------------------------------
+# Output directories
+#------------------------------------------------------------------------------
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
-# -----------------------------------------------------------------------------
-# Port-specific options
-# -----------------------------------------------------------------------------
-include(Options${PORT})
 
 # -----------------------------------------------------------------------------
@@ -151 +145 @@
 # -----------------------------------------------------------------------------
 PRINT_WEBKIT_OPTIONS()
-
-# -----------------------------------------------------------------------------
-# Create the configuration header
-# -----------------------------------------------------------------------------
-CREATE_CONFIGURATION_HEADER()

trunk/ChangeLog

@@ +1 @@
+2016-01-18  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [CMake] Duplicate attempts to find software during cmake stage
+        https://bugs.webkit.org/show_bug.cgi?id=153211
+
+        Reviewed by Martin Robinson.
+
+        * CMakeLists.txt: Remove duplication of commands in WebKitCommon.cmake.
+        * Source/cmake/WebKitCommon.cmake: Guard the entire file so it runs only once.
+
 2016-01-17  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/cmake/WebKitCommon.cmake

@@ -1 +1 @@
 # -----------------------------------------------------------------------------
-# Find common packages (used by all ports)
+# This file is included individually from various subdirectories (JSC, WTF,
+# WebCore, WebKit) in order to allow scripts to build only part of WebKit.
+# We want to run this file only once.
 # -----------------------------------------------------------------------------
-if (WIN32)
-    list(APPEND CMAKE_PROGRAM_PATH $ENV{SystemDrive}/cygwin/bin)
+if (NOT HAS_RUN_WEBKIT_COMMON)
+    set(HAS_RUN_WEBKIT_COMMON TRUE)
+
+    # -----------------------------------------------------------------------------
+    # Find common packages (used by all ports)
+    # -----------------------------------------------------------------------------
+    if (WIN32)
+        list(APPEND CMAKE_PROGRAM_PATH $ENV{SystemDrive}/cygwin/bin)
+    endif ()
+
+    find_package(BISON 2.1 REQUIRED)
+    if (!APPLE)
+        find_package(FLEX 2.5.34 REQUIRED)
+    endif ()
+
+    # TODO Enforce version requirement for gperf
+    find_package(Gperf 3.0.1 REQUIRED)
+
+    # TODO Enforce version requirement for perl
+    find_package(Perl 5.10.0 REQUIRED)
+
+    find_package(PythonInterp 2.7.0 REQUIRED)
+
+    # We cannot check for RUBY_FOUND because it is set only when the full package is installed and
+    # the only thing we need is the interpreter. Unlike Python, cmake does not provide a macro
+    # for finding only the Ruby interpreter.
+    find_package(Ruby 1.9)
+    if (NOT RUBY_EXECUTABLE OR RUBY_VERSION VERSION_LESS 1.9)
+        message(FATAL_ERROR "Ruby 1.9 or higher is required.")
+    endif ()
+
+    # -----------------------------------------------------------------------------
+    # Helper macros and feature defines
+    # -----------------------------------------------------------------------------
+
+    include(WebKitMacros)
+    include(WebKitFS)
+    include(WebKitHelpers)
+    include(WebKitFeatures)
+
+    include(OptionsCommon)
+    include(Options${PORT})
+
+    # -----------------------------------------------------------------------------
+    # config.h
+    # -----------------------------------------------------------------------------
+
+    CREATE_CONFIGURATION_HEADER()
 endif ()
-
-find_package(BISON 2.1 REQUIRED)
-if (!APPLE)
-    find_package(FLEX 2.5.34 REQUIRED)
-endif ()
-
-# TODO Enforce version requirement for gperf
-find_package(Gperf 3.0.1 REQUIRED)
-
-# TODO Enforce version requirement for perl
-find_package(Perl 5.10.0 REQUIRED)
-
-find_package(PythonInterp 2.7.0 REQUIRED)
-
-# We cannot check for RUBY_FOUND because it is set only when the full package is installed and
-# the only thing we need is the interpreter. Unlike Python, cmake does not provide a macro
-# for finding only the Ruby interpreter.
-find_package(Ruby 1.9)
-if (NOT RUBY_EXECUTABLE OR RUBY_VERSION VERSION_LESS 1.9)
-    message(FATAL_ERROR "Ruby 1.9 or higher is required.")
-endif ()
-
-include(WebKitMacros)
-include(WebKitFS)
-include(WebKitHelpers)
-include(WebKitFeatures)
-
-include(OptionsCommon)
-include(Options${PORT})
-
-CREATE_CONFIGURATION_HEADER()