diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-10-09 13:59:14 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-10-09 13:59:14 -0230 |
| commit | 8173652ea4fb85eaf7012eadeeab85e20da1fcb9 (patch) | |
| tree | f5ec9d7997dba73fc199a8622a6b8d1e2a6d5465 | |
| parent | ICE-5441 tests hang on Windows if executable not present (diff) | |
| download | ice-8173652ea4fb85eaf7012eadeeab85e20da1fcb9.tar.bz2 ice-8173652ea4fb85eaf7012eadeeab85e20da1fcb9.tar.xz ice-8173652ea4fb85eaf7012eadeeab85e20da1fcb9.zip | |
FIx for c++ allDemos script
| -rw-r--r-- | cpp/Makefile.mak | 5 | ||||
| -rwxr-xr-x | cpp/allDemos.py | 5 | ||||
| -rw-r--r-- | cpp/demo/Makefile.mak | 6 |
3 files changed, 5 insertions, 11 deletions
diff --git a/cpp/Makefile.mak b/cpp/Makefile.mak index f0d61c4a2ee..0e93cd4c542 100644 --- a/cpp/Makefile.mak +++ b/cpp/Makefile.mak @@ -13,7 +13,10 @@ top_srcdir = . !if "$(WINRT)" != "yes" -SUBDIRS = config src include test demo +SUBDIRS = config src include test +!if "$(CPP_COMPILER)" != "VC100" +SUBDIRS = $(SUBDIRS) demo +!endif INSTALL_SUBDIRS = "$(install_bindir)" "$(install_libdir)" "$(install_includedir)" "$(install_configdir)" diff --git a/cpp/allDemos.py b/cpp/allDemos.py index 744ad5a5e4a..c76260dbac1 100755 --- a/cpp/allDemos.py +++ b/cpp/allDemos.py @@ -46,10 +46,7 @@ demos = [ "Ice/value", "IceDiscovery/hello", "IceDiscovery/replication", -] - -if not Util.isWin32() or not Util.isVC100(): - demos += ["IceStorm/clock", + "IceStorm/clock", "IceStorm/counter", "IceStorm/replicated", "IceStorm/replicated2", diff --git a/cpp/demo/Makefile.mak b/cpp/demo/Makefile.mak index cf5755b1e44..d0365c18388 100644 --- a/cpp/demo/Makefile.mak +++ b/cpp/demo/Makefile.mak @@ -11,11 +11,6 @@ top_srcdir = .. !include $(top_srcdir)/config/Make.rules.mak -!if "$(CPP_COMPILER)" == "VC100" -SUBDIRS = IceUtil \ - Ice \ - IceDiscovery -!else SUBDIRS = IceUtil \ Ice \ IceDiscovery \ @@ -30,7 +25,6 @@ SUBDIRS = IceUtil \ SUBDIRS = $(SUBDIRS) \ IcePatch2 !endif -!endif $(EVERYTHING):: @for %i in ( $(SUBDIRS) ) do \ |