Skip to content
Permalink
Browse files

Merge PR #3211: [BUILD] ZeroC Ice 3.7 compatibility

  • Loading branch information...
mkrautz committed Aug 3, 2017
2 parents 4f87be8 + 39f861e commit f90ab07c7453b1a718d9943602c8984429e1ded3
Showing with 17 additions and 2 deletions.
  1. +16 −1 src/murmur/murmur.pro
  2. +1 −1 src/murmur/murmur_ice/murmur_ice.pro
@@ -88,8 +88,23 @@ ice {
win32:CONFIG(debug, debug|release) { win32:CONFIG(debug, debug|release) {
LIBS *= -lIceD -lIceUtilD LIBS *= -lIceD -lIceUtilD
} else { } else {
LIBS *= -lIce -lIceUtil # check Ice version, 3.7 merged IceUtil into Ice
ICE_VERSION = $$system(slice2cpp --version 2>&1)
ICE_MAJOR_VERSION = $$section(ICE_VERSION, ., 0, 0)
ICE_MINOR_VERSION = $$section(ICE_VERSION, ., 1, 1)

!equals(ICE_MAJOR_VERSION, 3) {
error("Unsupported Ice version")
}
lessThan(ICE_MINOR_VERSION, 7) {
# Ice < 3.7
LIBS *= -lIce -lIceUtil
} else {
# Ice 3.7+
LIBS *= -lIce
}
} }

DEFINES *= USE_ICE DEFINES *= USE_ICE


win32 { win32 {
@@ -16,7 +16,7 @@ win32 {
!isEmpty(ICE_VERSION) { !isEmpty(ICE_VERSION) {
EXTRA_SLICEFLAGS = -I/usr/share/Ice-$$ICE_VERSION/slice/ 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.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/ice/slice -I/usr/share/slice $$EXTRA_SLICEFLAGS ${QMAKE_FILE_NAME}
} }
slice.input = SLICEFILES slice.input = SLICEFILES
slice.CONFIG *= no_link explicit_dependencies slice.CONFIG *= no_link explicit_dependencies

0 comments on commit f90ab07

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