<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195242] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195242">195242</a></dd>
<dt>Author</dt> <dd>mcatanzaro@igalia.com</dd>
<dt>Date</dt> <dd>2016-01-18 17:23:08 -0800 (Mon, 18 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkCMakeListstxt">trunk/CMakeLists.txt</a></li>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourcecmakeWebKitCommoncmake">trunk/Source/cmake/WebKitCommon.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/CMakeLists.txt (195241 => 195242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/CMakeLists.txt 2016-01-19 01:08:47 UTC (rev 195241)
+++ trunk/CMakeLists.txt 2016-01-19 01:23:08 UTC (rev 195242)
</span><span class="lines">@@ -16,11 +16,6 @@
</span><span class="cx"> set(ENABLE_TOOLS ON)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-include(WebKitMacros)
-include(WebKitFS)
-include(WebKitHelpers)
-include(WebKitFeatures)
-
</del><span class="cx"> # -----------------------------------------------------------------------------
</span><span class="cx"> # Determine which port will be built
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><span class="lines">@@ -110,19 +105,18 @@
</span><span class="cx"> option(SHOULD_INSTALL_JS_SHELL "generate an installation rule to install the built JavaScript shell")
</span><span class="cx">
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><del>-# Common options
</del><ins>+# Common configuration
</ins><span class="cx"> #------------------------------------------------------------------------------
</span><del>-include(OptionsCommon)
</del><ins>+include(WebKitCommon)
+
+# -----------------------------------------------------------------------------
+# Output directories
+#------------------------------------------------------------------------------
</ins><span class="cx"> set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
</span><span class="cx"> set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
</span><span class="cx"> set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
</span><span class="cx">
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><del>-# Port-specific options
-# -----------------------------------------------------------------------------
-include(Options${PORT})
-
-# -----------------------------------------------------------------------------
</del><span class="cx"> # Enable API unit tests and create a target for the test runner
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><span class="cx"> if (ENABLE_API_TESTS)
</span><span class="lines">@@ -150,8 +144,3 @@
</span><span class="cx"> # Print the features list last, for maximum visibility.
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><span class="cx"> PRINT_WEBKIT_OPTIONS()
</span><del>-
-# -----------------------------------------------------------------------------
-# Create the configuration header
-# -----------------------------------------------------------------------------
-CREATE_CONFIGURATION_HEADER()
</del></span></pre></div>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (195241 => 195242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-01-19 01:08:47 UTC (rev 195241)
+++ trunk/ChangeLog 2016-01-19 01:23:08 UTC (rev 195242)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+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.
+
</ins><span class="cx"> 2016-01-17 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CMake] Do not build bmalloc when USE_SYSTEM_MALLOC is ON
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitCommoncmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitCommon.cmake (195241 => 195242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitCommon.cmake 2016-01-19 01:08:47 UTC (rev 195241)
+++ trunk/Source/cmake/WebKitCommon.cmake 2016-01-19 01:23:08 UTC (rev 195242)
</span><span class="lines">@@ -1,37 +1,54 @@
</span><span class="cx"> # -----------------------------------------------------------------------------
</span><del>-# Find common packages (used by all ports)
</del><ins>+# 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.
</ins><span class="cx"> # -----------------------------------------------------------------------------
</span><del>-if (WIN32)
- list(APPEND CMAKE_PROGRAM_PATH $ENV{SystemDrive}/cygwin/bin)
-endif ()
</del><ins>+if (NOT HAS_RUN_WEBKIT_COMMON)
+ set(HAS_RUN_WEBKIT_COMMON TRUE)
</ins><span class="cx">
</span><del>-find_package(BISON 2.1 REQUIRED)
-if (!APPLE)
- find_package(FLEX 2.5.34 REQUIRED)
-endif ()
</del><ins>+ # -----------------------------------------------------------------------------
+ # Find common packages (used by all ports)
+ # -----------------------------------------------------------------------------
+ if (WIN32)
+ list(APPEND CMAKE_PROGRAM_PATH $ENV{SystemDrive}/cygwin/bin)
+ endif ()
</ins><span class="cx">
</span><del>-# TODO Enforce version requirement for gperf
-find_package(Gperf 3.0.1 REQUIRED)
</del><ins>+ find_package(BISON 2.1 REQUIRED)
+ if (!APPLE)
+ find_package(FLEX 2.5.34 REQUIRED)
+ endif ()
</ins><span class="cx">
</span><del>-# TODO Enforce version requirement for perl
-find_package(Perl 5.10.0 REQUIRED)
</del><ins>+ # TODO Enforce version requirement for gperf
+ find_package(Gperf 3.0.1 REQUIRED)
</ins><span class="cx">
</span><del>-find_package(PythonInterp 2.7.0 REQUIRED)
</del><ins>+ # TODO Enforce version requirement for perl
+ find_package(Perl 5.10.0 REQUIRED)
</ins><span class="cx">
</span><del>-# 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 ()
</del><ins>+ find_package(PythonInterp 2.7.0 REQUIRED)
</ins><span class="cx">
</span><del>-include(WebKitMacros)
-include(WebKitFS)
-include(WebKitHelpers)
-include(WebKitFeatures)
</del><ins>+ # 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 ()
</ins><span class="cx">
</span><del>-include(OptionsCommon)
-include(Options${PORT})
</del><ins>+ # -----------------------------------------------------------------------------
+ # Helper macros and feature defines
+ # -----------------------------------------------------------------------------
</ins><span class="cx">
</span><del>-CREATE_CONFIGURATION_HEADER()
</del><ins>+ include(WebKitMacros)
+ include(WebKitFS)
+ include(WebKitHelpers)
+ include(WebKitFeatures)
+
+ include(OptionsCommon)
+ include(Options${PORT})
+
+ # -----------------------------------------------------------------------------
+ # config.h
+ # -----------------------------------------------------------------------------
+
+ CREATE_CONFIGURATION_HEADER()
+endif ()
</ins></span></pre>
</div>
</div>
</body>
</html>