diff options
| author | Stefan Hacker <dd0t@users.sourceforge.net> | 2015-10-19 23:34:44 +0300 |
|---|---|---|
| committer | Stefan Hacker <dd0t@users.sourceforge.net> | 2015-10-25 20:19:33 +0300 |
| commit | d8889f8bde96d1d998e5c25af6886aede5986889 (patch) | |
| tree | 42f8e28af167600eb0c782708b635e2cc7264530 /src/murmur/murmur.pro | |
| parent | 10c902fa105c0e64111b39e4315f022258effd15 (diff) | |
Extract Ice compilation to murmur_ice lib
This allows us to suppress the warnings the auto-generated
code produces.
Diffstat (limited to 'src/murmur/murmur.pro')
| -rw-r--r-- | src/murmur/murmur.pro | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/src/murmur/murmur.pro b/src/murmur/murmur.pro index dda41f164..759781d54 100644 --- a/src/murmur/murmur.pro +++ b/src/murmur/murmur.pro @@ -74,28 +74,9 @@ dbus { } ice { - SLICEFILES = Murmur.ice - - slice.output = ${QMAKE_FILE_BASE}.cpp - win32 { - slice.commands = slice2cpp --checksum -I\"$$ICE_PATH/slice\" ${QMAKE_FILE_NAME} - } else { - slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ -I/usr/share/Ice-3.5.0/slice/ -I/usr/share/Ice-3.5.1/slice/ ${QMAKE_FILE_NAME} - } - slice.input = SLICEFILES - slice.CONFIG *= no_link explicit_dependencies - slice.variable_out = SOURCES - - sliceh.output = ${QMAKE_FILE_BASE}.h - sliceh.depends = ${QMAKE_FILE_BASE}.cpp - sliceh.commands = $$escape_expand(\\n) - sliceh.input = SLICEFILES - sliceh.CONFIG *= no_link explicit_dependencies target_predeps - - QMAKE_EXTRA_COMPILERS *= slice sliceh - SOURCES *= MurmurIce.cpp HEADERS *= MurmurIce.h + win32:CONFIG(debug, debug|release) { LIBS *= -lIceD -lIceUtilD } else { @@ -125,13 +106,11 @@ ice { macx { INCLUDEPATH *= $$(MUMBLE_PREFIX)/Ice-3.4.2/include/ QMAKE_LIBDIR *= $$(MUMBLE_PREFIX)/Ice-3.4.2/lib/ - slice.commands = $$(MUMBLE_PREFIX)/Ice-3.4.2/bin/slice2cpp --checksum -I$$(MUMBLE_PREFIX)/Ice-3.4.2/slice/ Murmur.ice } CONFIG(ermine) { INCLUDEPATH *= $$(MUMBLE_ICE_PREFIX)/include/ QMAKE_LIBDIR *= $$(MUMBLE_ICE_PREFIX)/lib/ - slice.commands = $$(MUMBLE_ICE_PREFIX)/bin/slice2cpp --checksum -I$$(MUMBLE_ICE_PREFIX)/slice/ Murmur.ice } unix:!macx:CONFIG(static) { @@ -139,13 +118,20 @@ ice { QMAKE_LIBDIR *= /opt/Ice-3.3/lib LIBS *= -lbz2 QMAKE_CXXFLAGS *= -fPIC - slice.commands = /opt/Ice-3.3/bin/slice2cpp --checksum -I/opt/Ice-3.3/slice Murmur.ice } macx:CONFIG(static) { LIBS *= -lbz2 -liconv QMAKE_CXXFLAGS *= -fPIC } + + LIBS *= -lmurmur_ice + INCLUDEPATH *= murmur_ice + + unix { + QMAKE_CFLAGS *= "-isystem murmur_ice" + QMAKE_CXXFLAGS *= "-isystem murmur_ice" + } } bonjour { |