[CMake] Clean up SHARED_CORE option
authormcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 13 Jan 2017 18:09:34 +0000 (18:09 +0000)
committermcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 13 Jan 2017 18:09:34 +0000 (18:09 +0000)
https://bugs.webkit.org/show_bug.cgi?id=167004

Reviewed by Alex Christensen.

* CMakeLists.txt:

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

CMakeLists.txt
ChangeLog

index 79a17ba..bf3c4ef 100644 (file)
@@ -105,16 +105,15 @@ endif ()
 # -----------------------------------------------------------------------------
 # Default library types
 # -----------------------------------------------------------------------------
-option(SHARED_CORE "build JavaScriptCore and WebCore as shared libraries")
+option(SHARED_CORE "build WebCore as a shared library")
 
 if (SHARED_CORE)
-    set(JavaScriptCore_LIBRARY_TYPE SHARED)
     set(WebCore_LIBRARY_TYPE SHARED)
 else ()
-    set(JavaScriptCore_LIBRARY_TYPE SHARED)
     set(WebCore_LIBRARY_TYPE STATIC)
 endif ()
 
+set(JavaScriptCore_LIBRARY_TYPE SHARED)
 set(WebKit_LIBRARY_TYPE SHARED)
 set(WebKit2_LIBRARY_TYPE SHARED)
 set(WebCoreTestSupport_LIBRARY_TYPE STATIC)
index 14f6471..eecffc4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-01-13  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [CMake] Clean up SHARED_CORE option
+        https://bugs.webkit.org/show_bug.cgi?id=167004
+
+        Reviewed by Alex Christensen.
+
+        * CMakeLists.txt:
+
 2016-12-21  Konstantin Tokarev  <annulen@yandex.ru>
 
         set PYTHONPATH in separate COMMAND doesn't work with all CMake generators