diff options
Diffstat (limited to 'cpp/config/Make.rules')
| -rw-r--r-- | cpp/config/Make.rules | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 2d3fa07dad1..64f2d5d577c 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -9,7 +9,7 @@ # # Supported configurations # -supported-configs = shared static cpp11-shared cpp11-static +supported-configs = cpp98-shared cpp98-static cpp11-shared cpp11-static -include $(lang_srcdir)/config/Make.rules.$(os) ifeq ($(os),Darwin) @@ -42,10 +42,7 @@ endif # that are static-only # shared_projects = % -shared_excludes = IceUtil Slice \ - icebridge \ - test/Glacier2/% \ - test/IceBridge/% +shared_excludes = IceUtil Slice # # Build only few components with the static configuration (core and stubs) @@ -55,19 +52,35 @@ static_projects = test/Common \ test/Ice/% \ test/IceSSL/% \ test/IceDiscovery/simple \ - test/Glacier2/application \ test/IceGrid/simple static_excludes = test/Ice/library test/Ice/plugin +$(eval $(call validate-config)) + # -# Components and projects which are built with C++11 +# Components and projects which are built with C++98 +# +cpp98_projects = % +cpp98_excludes = glacier2router \ + icebridge \ + iceboxadmin \ + icegridnode icegridregistry icegridadmin icegriddb \ + IceStormService icestormadmin icestormdb \ + IceXML \ + test/Glacier2/% \ + test/IceBridge/% \ + test/IceGrid/% \ + test/IceStorm/% + +# +# Components and projects which are built with C++17 # cpp11_components = $(coreandstub_components) \ glacier2router Glacier2CryptPermissionsVerifier \ - icebox icebridge \ - IceDB \ - IceXML \ + icebox iceboxadmin \ + icebridge \ + IceDB IceXML \ icegridnode icegridregistry icegridadmin icegriddb \ IceStormService icestormadmin icestormdb \ @@ -108,9 +121,10 @@ endif # cpp11_cppflags = -DICE_CPP11_MAPPING -std=c++17 cpp11_ldflags = $(cpp11_cppflags) -cpp11_targetname = $(if $(or $(filter-out $($1_target),program),$(filter $(bindir)%,$($4_targetdir))),++11) +cpp11_targetname = $(if $(or $(filter-out $($1_target),program), $(if $(filter icebox,$1), $(filter $(bindir)%,$($4_targetdir)),)),++11) cpp11_targetdir = $(if $(filter %/build,$5),cpp11) + # # $(call make-cpp-src-project,$1=project) # |