diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-12-06 12:40:56 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-26 02:33:15 +0100 |
| commit | 9ecc1d5ad7440c03f26ad557e45c0a92016d9367 (patch) | |
| tree | 0ef21717d8da26af5f45aac909d7a99d04e7ffb4 | |
| parent | a038352dc05a880eec6b94b5ba4e01673b1565ca (diff) | |
OS X Mavericks/Xcode5: Find libxslt and libxml2 headers
The development headers are no longer installed in a system location,
but only in the sysroot.
Change-Id: Ie9b85ff638c435e7e4d0a538f6e72d2cdbae88c8
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| -rw-r--r-- | Source/WebCore/WebCore.pri | 2 | ||||
| -rw-r--r-- | Tools/qmake/config.tests/libxml2/libxml2.pro | 2 | ||||
| -rw-r--r-- | Tools/qmake/config.tests/libxslt/libxslt.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri index 28dae593a..6d0b4ed12 100644 --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -112,7 +112,7 @@ INCLUDEPATH += $$WEBCORE_GENERATED_SOURCES_DIR enable?(XSLT) { use?(LIBXML2) { mac { - INCLUDEPATH += /usr/include/libxslt /usr/include/libxml2 + QMAKE_CXXFLAGS += -iwithsysroot /usr/include/libxslt -iwithsysroot /usr/include/libxml2 LIBS += -lxml2 -lxslt } else { PKGCONFIG += libxslt libxml-2.0 diff --git a/Tools/qmake/config.tests/libxml2/libxml2.pro b/Tools/qmake/config.tests/libxml2/libxml2.pro index bd72944f0..ebeb1cbd6 100644 --- a/Tools/qmake/config.tests/libxml2/libxml2.pro +++ b/Tools/qmake/config.tests/libxml2/libxml2.pro @@ -1,7 +1,7 @@ CONFIG -= qt SOURCES = libxml2.cpp mac { - INCLUDEPATH += /usr/include/libxml2 + QMAKE_CXXFLAGS += -iwithsysroot /usr/include/libxml2 LIBS += -lxml2 } else { PKGCONFIG += libxml-2.0 diff --git a/Tools/qmake/config.tests/libxslt/libxslt.pro b/Tools/qmake/config.tests/libxslt/libxslt.pro index 1943485d0..cd25f2a83 100644 --- a/Tools/qmake/config.tests/libxslt/libxslt.pro +++ b/Tools/qmake/config.tests/libxslt/libxslt.pro @@ -1,7 +1,7 @@ CONFIG -= qt SOURCES = libxslt.cpp mac { - INCLUDEPATH += /usr/include/libxslt /usr/include/libxml2 + QMAKE_CXXFLAGS += -iwithsysroot /usr/include/libxslt -iwithsysroot /usr/include/libxml2 LIBS += -lxslt } else { PKGCONFIG += libxslt |