diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2013-06-13 21:52:14 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2013-06-13 21:52:14 +0200 |
| commit | 91f45e1948c2bfdd9083a0fd22c6ed6d49e7fed0 (patch) | |
| tree | cae5f21d55adf9c48d4f6eeac248f0a5a6f19307 /boost | |
| parent | aaf4c660e0882566a2855a634c39ffe6f8816ece (diff) | |
Handle --database option directly in automake and VC++ projects
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/boost-vc10.vcxproj | 2 | ||||
| -rw-r--r-- | boost/boost-vc11.vcxproj | 2 | ||||
| -rw-r--r-- | boost/boost-vc9.vcproj | 2 | ||||
| -rw-r--r-- | boost/makefile | 6 |
4 files changed, 7 insertions, 5 deletions
diff --git a/boost/boost-vc10.vcxproj b/boost/boost-vc10.vcxproj index 1a8090c..c6e5083 100644 --- a/boost/boost-vc10.vcxproj +++ b/boost/boost-vc10.vcxproj @@ -154,7 +154,7 @@ __custom_build_entry__( __path__(odb_header_stem).hxx, odb __path__(odb_header_stem).hxx, -odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)))) __path__(odb_header_stem).hxx, +odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options))) __path__(odb_header_stem).hxx, __path__(odb_header_stem)-odb.hxx;__path__(odb_header_stem)-odb.ixx;__path__(odb_header_stem)-odb.cxx) </ItemGroup> <ItemGroup> diff --git a/boost/boost-vc11.vcxproj b/boost/boost-vc11.vcxproj index 6a768f0..ef60fc2 100644 --- a/boost/boost-vc11.vcxproj +++ b/boost/boost-vc11.vcxproj @@ -158,7 +158,7 @@ __custom_build_entry__( __path__(odb_header_stem).hxx, odb __path__(odb_header_stem).hxx, -odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)))) __path__(odb_header_stem).hxx, +odb.exe --std c++11 --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options))) __path__(odb_header_stem).hxx, __path__(odb_header_stem)-odb.hxx;__path__(odb_header_stem)-odb.ixx;__path__(odb_header_stem)-odb.cxx) </ItemGroup> <ItemGroup> diff --git a/boost/boost-vc9.vcproj b/boost/boost-vc9.vcproj index a282086..e3f5252 100644 --- a/boost/boost-vc9.vcproj +++ b/boost/boost-vc9.vcproj @@ -344,7 +344,7 @@ __source_entries__(extra_sources) __file_entry_custom_build__( __path__(odb_header_stem).hxx, odb __path__(odb_header_stem).hxx, -odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)))) __path__(odb_header_stem).hxx, +odb.exe --database __value__(database) __xml__(__shell_quotes__(__value__(odb_options))) __path__(odb_header_stem).hxx, __path__(odb_header_stem)-odb.hxx;__path__(odb_header_stem)-odb.ixx;__path__(odb_header_stem)-odb.cxx) __file_entry__(__path__(odb_header_stem)-odb.hxx) __file_entry__(__path__(odb_header_stem)-odb.ixx) diff --git a/boost/makefile b/boost/makefile index c254212..a5bba42 100644 --- a/boost/makefile +++ b/boost/makefile @@ -58,11 +58,13 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): $(odb) $(gen): odb := $(odb) -$(gen) $(dist): export odb_options += --database $(db_id) --profile boost \ +$(gen) $(dist): export odb_options += --profile boost \ --generate-query --generate-schema --generate-session --table-prefix boost_ $(gen): cpp_options := -I$(src_base) $(gen): $(odb.l.cpp-options) $(odb_boost.l.cpp-options) $(boost.l.cpp-options) +$(gen): odb_options += --database $(db_id) + $(call include-dep,$(cxx_od),$(cxx_obj),$(gen)) # Alias for default target. @@ -73,7 +75,7 @@ $(out_base)/: $(driver) # name := $(subst /,-,$(subst $(src_root)/,,$(src_base))) -$(dist): db_id := @database@ + $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): export name := $(name) |