diff options
Diffstat (limited to 'xsd/tests/cxx/tree/compilation')
| -rw-r--r-- | xsd/tests/cxx/tree/compilation/driver.cxx | 6 | ||||
| -rw-r--r-- | xsd/tests/cxx/tree/compilation/makefile | 14 |
2 files changed, 11 insertions, 9 deletions
diff --git a/xsd/tests/cxx/tree/compilation/driver.cxx b/xsd/tests/cxx/tree/compilation/driver.cxx index 8135c9b..c2e6298 100644 --- a/xsd/tests/cxx/tree/compilation/driver.cxx +++ b/xsd/tests/cxx/tree/compilation/driver.cxx @@ -1,13 +1,11 @@ // file : tests/cxx/tree/compilation/driver.cxx -// author : Boris Kolpackov <boris@codesynthesis.com> -// copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC +// copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file // Make sure the runtime library compiles by explicitly instantiating // all the types. // -#include <memory> // std::auto_ptr #include <iostream> #include "test.hxx" @@ -15,7 +13,7 @@ using namespace std; using namespace test; -template class xsd::cxx::tree::simple_type<xml_schema::type>; +template class xsd::cxx::tree::simple_type<char, xml_schema::type>; // String types. // diff --git a/xsd/tests/cxx/tree/compilation/makefile b/xsd/tests/cxx/tree/compilation/makefile index 93b88db..16dbb91 100644 --- a/xsd/tests/cxx/tree/compilation/makefile +++ b/xsd/tests/cxx/tree/compilation/makefile @@ -1,6 +1,5 @@ # file : tests/cxx/tree/compilation/makefile -# author : Boris Kolpackov <boris@codesynthesis.com> -# copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC +# copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC # license : GNU GPL v2 + exceptions; see accompanying LICENSE file include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make @@ -27,17 +26,17 @@ $(call import,\ # $(driver): $(obj) $(xerces_c.l) -$(obj) $(dep): cpp_options := -I$(src_root)/libxsd +$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options := --generate-serialization +$(gen): xsd_options += --generate-serialization $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # @@ -74,7 +73,12 @@ endif $(call include,$(bld_root)/cxx/o-e.make) $(call include,$(bld_root)/cxx/cxx-o.make) $(call include,$(bld_root)/cxx/cxx-d.make) + +$(call include,$(bld_root)/cxx/standard.make) # cxx_standard +ifdef cxx_standard +$(gen): xsd_options += --std $(cxx_standard) $(call include,$(scf_root)/xsd/tree/xsd-cxx.make) +endif # Dependencies. |