aboutsummaryrefslogtreecommitdiff
path: root/qt/common
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-08-24 17:13:55 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-08-24 17:13:55 +0200
commitff3950866c0f756a5b6f379b9f95f01fff4a9ec7 (patch)
tree1171b1c1ecd9cffc5022d34d8d411846b98adf09 /qt/common
parent1fca8273447e0048941bbfe8ca23466f103c42f3 (diff)
Make tests use unique table prefixes
Diffstat (limited to 'qt/common')
-rw-r--r--qt/common/containers/makefile3
-rw-r--r--qt/common/smart-ptr/makefile2
-rw-r--r--qt/common/template/makefile3
3 files changed, 5 insertions, 3 deletions
diff --git a/qt/common/containers/makefile b/qt/common/containers/makefile
index 85aec25..f675c37 100644
--- a/qt/common/containers/makefile
+++ b/qt/common/containers/makefile
@@ -45,7 +45,8 @@ gen := $(addprefix $(out_base)/,$(genf))
$(gen): $(odb)
$(gen): odb := $(odb)
$(gen) $(dist): export odb_options += --database $(db_id) \
---profile qt/containers --profile qt/basic --generate-schema
+--profile qt/containers --profile qt/basic --generate-schema \
+--table-prefix qt_common_containers_
$(gen): cpp_options := -I$(src_base)
$(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \
$(qt_core.l.cpp-options)
diff --git a/qt/common/smart-ptr/makefile b/qt/common/smart-ptr/makefile
index a7742f2..21ba8b8 100644
--- a/qt/common/smart-ptr/makefile
+++ b/qt/common/smart-ptr/makefile
@@ -45,7 +45,7 @@ gen := $(addprefix $(out_base)/,$(genf))
$(gen): $(odb)
$(gen): odb := $(odb)
$(gen) $(dist): export odb_options += --database $(db_id) \
---profile qt/smart-ptr --generate-schema
+--profile qt/smart-ptr --generate-schema --table-prefix qt_common_smart_ptr_
$(gen): cpp_options := -I$(src_base)
$(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \
$(qt_core.l.cpp-options)
diff --git a/qt/common/template/makefile b/qt/common/template/makefile
index e3f52f0..d0cb3d8 100644
--- a/qt/common/template/makefile
+++ b/qt/common/template/makefile
@@ -45,7 +45,8 @@ gen := $(addprefix $(out_base)/,$(genf))
$(gen): $(odb)
$(gen): odb := $(odb)
$(gen) $(dist): export odb_options += --database $(db_id) \
---profile qt/version --generate-schema # CHANGE qt/version
+--profile qt/version --generate-schema \
+--table-prefix qt_common_template_ #@@ CHANGE table prefix, qt/version
$(gen): cpp_options := -I$(src_base)
$(gen): $(common.l.cpp-options) $(odb_qt.l.cpp-options) \
$(qt_core.l.cpp-options)