diff options
| author | Joe George <joe@zeroc.com> | 2016-01-05 09:22:49 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-01-05 09:25:53 -0500 |
| commit | d3534b61da073b97552fb3174008698f97e27e7b (patch) | |
| tree | bf885318b5d799f8cb431d52e2a0ba93b7ca81ce /cpp/src | |
| parent | C++98 object factory static initialization simplification (diff) | |
| download | ice-d3534b61da073b97552fb3174008698f97e27e7b.tar.bz2 ice-d3534b61da073b97552fb3174008698f97e27e7b.tar.xz ice-d3534b61da073b97552fb3174008698f97e27e7b.zip | |
Various fixes to Travis CI
- Add BUILD_ICE_BT flag we IceBT build can be disabled
- Use GCC 5
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Makefile b/cpp/src/Makefile index 488bf8e5917..0307fe8cacf 100644 --- a/cpp/src/Makefile +++ b/cpp/src/Makefile @@ -24,7 +24,7 @@ ifeq ($(CPP11_MAPPING),yes) IceBox \ IceLocatorDiscovery -ifneq ($(findstring Ubuntu,$(shell uname -a)),) +ifeq ($(BUILD_ICE_BT),yes) SUBDIRS := $(SUBDIRS) IceXML IceBT endif @@ -70,7 +70,7 @@ endif IceStorm \ IceGrid -ifneq ($(findstring Ubuntu,$(shell uname -a)),) +ifeq ($(BUILD_ICE_BT),yes) SUBDIRS := $(SUBDIRS) IceBT endif |