From 47b943aa03a569fc23b9057ba572e9aeb63b5822 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 21 Nov 2011 16:32:59 +0200
Subject: Add support for common tests without ODB compilation for automake/VC
 projects

---
 common/template/Makefile.am           | 3 +++
 common/template/template-vc10.vcxproj | 9 ++++++---
 common/template/template-vc9.vcproj   | 5 +++--
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'common/template')

diff --git a/common/template/Makefile.am b/common/template/Makefile.am
index eb1ae97..3cd0fb2 100644
--- a/common/template/Makefile.am
+++ b/common/template/Makefile.am
@@ -14,6 +14,8 @@ AM_CPPFLAGS += -I'$(builddir)' -I'$(srcdir)'
 TESTS=$(top_builddir)/tester
 TESTS_ENVIRONMENT=top_builddir=$(top_builddir); export top_builddir;
 
+m4_ifelse(__value__(odb_options),,,
+
 # ODB compilation.
 #
 driver_SOURCES += test.hxx
@@ -27,3 +29,4 @@ ODBCPPFLAGS = @ODBCPPFLAGS@
 
 test-odb.hxx: test.hxx
 	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS)  __value__(odb_options) $<
+)
diff --git a/common/template/template-vc10.vcxproj b/common/template/template-vc10.vcxproj
index 4a2711c..bdaf37b 100644
--- a/common/template/template-vc10.vcxproj
+++ b/common/template/template-vc10.vcxproj
@@ -154,21 +154,24 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+m4_ifelse(__value__(odb_options),,,
+m4_dnl
   <ItemGroup>
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
 odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
-  </ItemGroup>
+  </ItemGroup>)
   <ItemGroup>
+m4_ifelse(__value__(odb_options),,,
 __header_entry__(test-odb.hxx)
-__header_entry__(test-odb.ixx)
+__header_entry__(test-odb.ixx))
 __header_entries__(extra_headers)
   </ItemGroup>
   <ItemGroup>
 __source_entry__(driver.cxx)
-__source_entry__(test-odb.cxx)
+m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx))
 __source_entries__(extra_sources)
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/common/template/template-vc9.vcproj b/common/template/template-vc9.vcproj
index 49e95ec..9bb8cf8 100644
--- a/common/template/template-vc9.vcproj
+++ b/common/template/template-vc9.vcproj
@@ -337,7 +337,7 @@
 			UniqueIdentifier="{__uuid__()}"
 			>
 __source_entry__(driver.cxx)
-__source_entry__(test-odb.cxx)
+m4_ifelse(__value__(odb_options),,,__source_entry__(test-odb.cxx))
 __source_entries__(extra_sources)
 		</Filter>
 		<Filter
@@ -345,13 +345,14 @@ __source_entries__(extra_sources)
 			Filter="h;hxx;ixx;txx"
 			UniqueIdentifier="{__uuid__()}"
 			>
+m4_ifelse(__value__(odb_options),,,
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
 odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
-__file_entry__(test-odb.ixx)
+__file_entry__(test-odb.ixx))
 __file_entries__(extra_headers)
 		</Filter>
 	</Files>
-- 
cgit v1.1