Skip to content
Permalink
Browse files

Merge pull request #2617 from mkrautz/query-extra-sliceflags

murmur_ice: use `slice2cpp --version` to guess the slice include path for slice2cpp.
  • Loading branch information...
Kissaki committed Nov 3, 2016
2 parents 4efd506 + 8396904 commit b595d6506ae85546a84fddf6179f7dace4353d9c
Showing with 6 additions and 1 deletion.
  1. +6 −1 src/murmur/murmur_ice/murmur_ice.pro
@@ -11,7 +11,12 @@ 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}
ICE_VERSION = $$system(slice2cpp --version 2>&1)
EXTRA_SLICEFLAGS =
!isEmpty(ICE_VERSION) {
EXTRA_SLICEFLAGS = -I/usr/share/Ice-$$ICE_VERSION/slice/
}
slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice $$EXTRA_SLICEFLAGS ${QMAKE_FILE_NAME}
}
slice.input = SLICEFILES
slice.CONFIG *= no_link explicit_dependencies

0 comments on commit b595d65

Please sign in to comment.
You can’t perform that action at this time.