From 0301abe9322092ffef1d7713f838dcc12ab29a8e Mon Sep 17 00:00:00 2001 From: Boris Kolpackov <boris@codesynthesis.com> Date: Thu, 13 Sep 2012 12:01:21 +0200 Subject: Replace src_base with suitable path for each target build system --- oracle/template/Makefile.am | 2 +- oracle/template/template-vc10.vcxproj | 2 +- oracle/template/template-vc9.vcproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/oracle/template/Makefile.am b/oracle/template/Makefile.am index cb3bd54..135eb4e 100644 --- a/oracle/template/Makefile.am +++ b/oracle/template/Makefile.am @@ -31,5 +31,5 @@ ODBFLAGS += --std c++11 endif test-odb.hxx: test.hxx - $(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $< + $(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) m4_patsubst(__value__(odb_options), __value__(src_base), $(srcdir)) $< ) diff --git a/oracle/template/template-vc10.vcxproj b/oracle/template/template-vc10.vcxproj index 5246cf8..92066cf 100644 --- a/oracle/template/template-vc10.vcxproj +++ b/oracle/template/template-vc10.vcxproj @@ -160,7 +160,7 @@ m4_dnl __custom_build_entry__( test.hxx, odb test.hxx, -odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\libcommon)) test.hxx, +odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), __value__(src_base)/, ) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) </ItemGroup>) <ItemGroup> diff --git a/oracle/template/template-vc9.vcproj b/oracle/template/template-vc9.vcproj index bf9b1a7..de9804e 100644 --- a/oracle/template/template-vc9.vcproj +++ b/oracle/template/template-vc9.vcproj @@ -349,7 +349,7 @@ __ifelse__(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, -odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\libcommon)) test.hxx, +odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), __value__(src_base)/, ) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) __file_entry__(test-odb.hxx) __file_entry__(test-odb.ixx)) -- cgit v1.1