2010-08-20 Lucas De Marchi <lucas.demarchi@profusion.mobi>

        Unreviewed build fix.

        As opposed to WebCore, JavascriptCore and wtf, webkit is always a
        shared library. After r65366, libewebkit.so was not being installed
        anymore when building with SHARED_CORE=0 (which is the default). This
        partially reverts that revision in order to fix this issue.

        * CMakeLists.txt: always install webkit library.

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

diff --git a/WebKit/CMakeLists.txt b/WebKit/CMakeLists.txt
index 379c8e43282142ffc926ae42f8f7762a3063b67c..6bc5100577164e17058232a1c6e4cb760df6fee8 100644 (file)
--- a/WebKit/CMakeLists.txt
+++ b/WebKit/CMakeLists.txt
@@ -71,7 +71,5 @@ IF (WebKit_LINK_FLAGS)
     ADD_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} LINK_FLAGS "${WebKit_LINK_FLAGS}")
 ENDIF ()
 
-IF (SHARED_CORE)
-    SET_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
-    INSTALL(TARGETS ${WebKit_LIBRARY_NAME} DESTINATION lib)
-ENDIF ()
+SET_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
+INSTALL(TARGETS ${WebKit_LIBRARY_NAME} DESTINATION lib)

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c7858fbe38914eef74d63af1b518ef112c692549..9747ffa622a2ad7dd3b35ea42ddae59f8526997c 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-20  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Unreviewed build fix.
+
+        As opposed to WebCore, JavascriptCore and wtf, webkit is always a
+        shared library. After r65366, libewebkit.so was not being installed
+        anymore when building with SHARED_CORE=0 (which is the default). This
+        partially reverts that revision in order to fix this issue.
+
+        * CMakeLists.txt: always install webkit library.
+
 2010-08-17  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
 
         Reviewed by Darin Adler.