Commit 96080150 authored by vestbo@webkit.org's avatar vestbo@webkit.org

2009-06-23 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>

        Rubber-stamped by Simon Hausmann.

        [Qt] Resolve absolute path to library install_name manually

        Since our target.path is set to the Qt directory (to be able
        to do 'make install') the 'absolute_library_soname' option
        to QMake did not do the right thing.

        We now compute the absolute path manually using DESTDIR.

        * WebCore.pro:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@44986 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 1baeb052
2009-06-23 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Rubber-stamped by Simon Hausmann.
[Qt] Resolve absolute path to library install_name manually
Since our target.path is set to the Qt directory (to be able
to do 'make install') the 'absolute_library_soname' option
to QMake did not do the right thing.
We now compute the absolute path manually using DESTDIR.
* WebCore.pro:
2009-06-22 Simon Fraser <simon.fraser@apple.com>
Reviewed by Oliver Hunt.
......
......@@ -25,7 +25,6 @@ CONFIG(QTDIR_build) {
}
DESTDIR = $$OUTPUT_DIR/lib
macx:CONFIG += absolute_library_soname
}
GENERATED_SOURCES_DIR_SLASH = $$GENERATED_SOURCES_DIR${QMAKE_DIR_SEP}
......@@ -2184,21 +2183,25 @@ HEADERS += $$WEBKIT_API_HEADERS
QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace
}
mac:!static:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework) {
!build_pass {
message("Building QtWebKit as a framework, as that's how Qt was built. You can")
message("override this by passing CONFIG+=webkit_no_framework to build-webkit.")
} else {
debug_and_release:CONFIG(debug, debug|release) {
TARGET = $$qtLibraryTarget($$TARGET)
mac {
!static:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework) {
!build_pass {
message("Building QtWebKit as a framework, as that's how Qt was built. You can")
message("override this by passing CONFIG+=webkit_no_framework to build-webkit.")
} else {
debug_and_release:CONFIG(debug, debug|release) {
TARGET = $$qtLibraryTarget($$TARGET)
}
}
CONFIG += lib_bundle qt_no_framework_direct_includes qt_framework
FRAMEWORK_HEADERS.version = Versions
FRAMEWORK_HEADERS.files = $$WEBKIT_API_HEADERS
FRAMEWORK_HEADERS.path = Headers
QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
}
CONFIG += lib_bundle qt_no_framework_direct_includes qt_framework
FRAMEWORK_HEADERS.version = Versions
FRAMEWORK_HEADERS.files = $$WEBKIT_API_HEADERS
FRAMEWORK_HEADERS.path = Headers
QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
QMAKE_LFLAGS_SONAME = "$${QMAKE_LFLAGS_SONAME}$${DESTDIR}$${QMAKE_DIR_SEP}"
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment