aboutsummaryrefslogtreecommitdiff
path: root/common/makefile
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-01-09 14:50:26 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2013-01-16 07:42:56 +0200
commit5cf30ccfe764701f549e4152ad312187221f5285 (patch)
treef3e558a08ab9d2d8fb00855ab1c0ef42d4d9af91 /common/makefile
parent9bd664e4cb39f6654e8754c8cfd4c28295ee2d90 (diff)
Implement two-phase session insertion
On the first step an uninitialized object is inserted into the cache as before (this is necessary to handle recursive loading). The second step is to notify the session that the object has been initialized. On this second step the session can perform change tracking preparations, such as make a copy of the object or reset the modification flag. New test: common/session/custom (implements a custom session that uses copies to track changes).
Diffstat (limited to 'common/makefile')
-rw-r--r--common/makefile15
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)))