diff options
Diffstat (limited to 'common/makefile')
| -rw-r--r-- | common/makefile | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/common/makefile b/common/makefile index decfcd8..8c93f72 100644 --- a/common/makefile +++ b/common/makefile @@ -47,21 +47,30 @@ virtual \ wrapper thread_tests := threads - -all_tests := $(tests) $(thread_tests) -build_tests := $(tests) $(thread_tests) +cxx11_tests := session/custom default := $(out_base)/ dist := $(out_base)/.dist test := $(out_base)/.test clean := $(out_base)/.clean +$(default): +$(call include,$(bld_root)/cxx/standard.make) # cxx_standard + +all_tests := $(tests) $(thread_tests) $(cxx11_tests) +build_tests := $(tests) $(thread_tests) + +ifeq ($(cxx_standard),c++11) +build_tests += $(cxx11_tests) +endif + $(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests))) name := common $(dist): name := $(name) $(dist): export dirs := $(filter-out include,$(tests)) $(dist): export thread_dirs := $(thread_tests) +$(dist): export cxx11_dirs := $(cxx11_tests) $(dist): export extra_dist := test.bat $(call vc9slns,$(name)) \ $(call vc10slns,$(name)) $(call vc11slns,$(name)) $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests))) |