[CMake] Define SHOULD_INSTALL_JS_SHELL before including ports Options files.
authorrakuco@webkit.org <rakuco@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 3 May 2014 18:52:45 +0000 (18:52 +0000)
committerrakuco@webkit.org <rakuco@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 3 May 2014 18:52:45 +0000 (18:52 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@168225 268f45cc-cd09-0410-ab3c-d52691b4dbfc

CMakeLists.txt
ChangeLog

index ae313e9..51d701d 100644 (file)
@@ -129,6 +129,11 @@ set(WebKit2_LIBRARY_TYPE SHARED)
 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 @@ if (ENABLE_API_TESTS)
 endif ()
 
 # -----------------------------------------------------------------------------
-# Install JavaScript shell
-# -----------------------------------------------------------------------------
-option(SHOULD_INSTALL_JS_SHELL "generate an installation rule to install the built JavaScript shell")
-
-# -----------------------------------------------------------------------------
 # Define packaging
 # -----------------------------------------------------------------------------
 include(WebKitPackaging)
index 89d7544..2c9aaf5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2014-05-03  Raphael Kubo da Costa  <raphael.kubo.da.costa@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  <ddkilzer@apple.com>
 
         Really remove ENABLE_PLUGIN_PROXY_FOR_VIDEO