Title: [168225] trunk
- Revision
- 168225
- Author
- rak...@webkit.org
- Date
- 2014-05-03 11:52:45 -0700 (Sat, 03 May 2014)
Log Message
[CMake] Define SHOULD_INSTALL_JS_SHELL before including ports Options files.
https://bugs.webkit.org/show_bug.cgi?id=132525
Reviewed by Martin Robinson.
* CMakeLists.txt: If OPTION() is called after Options${PORT}.cmake is included, it will
override whatever value a port may have set for it. The GTK+ port, for example, tries to set
it to SHOULD_INSTALL_JS_SHELL to ON by default, even though it did not happen before.
Modified Paths
Diff
Modified: trunk/CMakeLists.txt (168224 => 168225)
--- trunk/CMakeLists.txt 2014-05-03 17:40:22 UTC (rev 168224)
+++ trunk/CMakeLists.txt 2014-05-03 18:52:45 UTC (rev 168225)
@@ -129,6 +129,11 @@
set(WebCoreTestSupport_LIBRARY_TYPE STATIC)
# -----------------------------------------------------------------------------
+# Install _javascript_ shell
+# -----------------------------------------------------------------------------
+option(SHOULD_INSTALL_JS_SHELL "generate an installation rule to install the built _javascript_ shell")
+
+# -----------------------------------------------------------------------------
# Common options
#------------------------------------------------------------------------------
include(OptionsCommon)
@@ -149,11 +154,6 @@
endif ()
# -----------------------------------------------------------------------------
-# Install _javascript_ shell
-# -----------------------------------------------------------------------------
-option(SHOULD_INSTALL_JS_SHELL "generate an installation rule to install the built _javascript_ shell")
-
-# -----------------------------------------------------------------------------
# Define packaging
# -----------------------------------------------------------------------------
include(WebKitPackaging)
Modified: trunk/ChangeLog (168224 => 168225)
--- trunk/ChangeLog 2014-05-03 17:40:22 UTC (rev 168224)
+++ trunk/ChangeLog 2014-05-03 18:52:45 UTC (rev 168225)
@@ -1,3 +1,14 @@
+2014-05-03 Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
+
+ [CMake] Define SHOULD_INSTALL_JS_SHELL before including ports Options files.
+ https://bugs.webkit.org/show_bug.cgi?id=132525
+
+ Reviewed by Martin Robinson.
+
+ * CMakeLists.txt: If OPTION() is called after Options${PORT}.cmake is included, it will
+ override whatever value a port may have set for it. The GTK+ port, for example, tries to set
+ it to SHOULD_INSTALL_JS_SHELL to ON by default, even though it did not happen before.
+
2014-05-01 David Kilzer <ddkil...@apple.com>
Really remove ENABLE_PLUGIN_PROXY_FOR_VIDEO
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
