From dc4b2b20565a58f09c761b9affd6abdc7edb705b Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 25 Feb 2011 12:34:07 +0200 Subject: Add support for tests in subdirectories --- boost/common/boost-common-vc10.sln | 15 +++++++++++++++ boost/common/boost-common-vc9.sln | 15 +++++++++++++++ boost/common/common-vc10.sln | 15 --------------- boost/common/common-vc9.sln | 15 --------------- boost/common/makefile | 2 +- boost/common/template/makefile | 2 +- boost/common/template/template-vc10.vcxproj | 18 +++++++++--------- boost/common/template/template-vc9.vcproj | 18 +++++++++--------- 8 files changed, 50 insertions(+), 50 deletions(-) create mode 100644 boost/common/boost-common-vc10.sln create mode 100644 boost/common/boost-common-vc9.sln delete mode 100644 boost/common/common-vc10.sln delete mode 100644 boost/common/common-vc9.sln (limited to 'boost/common') diff --git a/boost/common/boost-common-vc10.sln b/boost/common/boost-common-vc10.sln new file mode 100644 index 0000000..9a5dc32 --- /dev/null +++ b/boost/common/boost-common-vc10.sln @@ -0,0 +1,15 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +__projects__ +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution +__solution_configurations__ + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution +__project_configurations__ + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/boost/common/boost-common-vc9.sln b/boost/common/boost-common-vc9.sln new file mode 100644 index 0000000..2ec9432 --- /dev/null +++ b/boost/common/boost-common-vc9.sln @@ -0,0 +1,15 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +__projects__ +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution +__solution_configurations__ + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution +__project_configurations__ + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/boost/common/common-vc10.sln b/boost/common/common-vc10.sln deleted file mode 100644 index 9a5dc32..0000000 --- a/boost/common/common-vc10.sln +++ /dev/null @@ -1,15 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -__projects__ -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution -__solution_configurations__ - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution -__project_configurations__ - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/boost/common/common-vc9.sln b/boost/common/common-vc9.sln deleted file mode 100644 index 2ec9432..0000000 --- a/boost/common/common-vc9.sln +++ /dev/null @@ -1,15 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -__projects__ -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution -__solution_configurations__ - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution -__project_configurations__ - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/boost/common/makefile b/boost/common/makefile index eeb083e..4af0162 100644 --- a/boost/common/makefile +++ b/boost/common/makefile @@ -18,7 +18,7 @@ clean := $(out_base)/.clean $(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests))) -name := $(notdir $(src_base)) +name := boost-common $(dist): name := $(name) $(dist): export dirs := $(tests) $(dist): export extra_dist := test.bat $(call vc9slns,$(name)) \ diff --git a/boost/common/template/makefile b/boost/common/template/makefile index d22654e..1a97660 100644 --- a/boost/common/template/makefile +++ b/boost/common/template/makefile @@ -58,7 +58,7 @@ $(out_base)/: $(driver) # Dist # -name := $(notdir $(src_base)) +name := $(subst /,-,$(subst $(src_root)/boost/common/,,$(src_base))) $(dist): db_id := @database@ $(dist): sources := $(cxx_tun) diff --git a/boost/common/template/template-vc10.vcxproj b/boost/common/template/template-vc10.vcxproj index 44c2813..e3c66a6 100644 --- a/boost/common/template/template-vc10.vcxproj +++ b/boost/common/template/template-vc10.vcxproj @@ -89,11 +89,11 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) - ..\..\..\libcommon + $(SolutionDir)\..\..\libcommon 4068;4355;4800;4290;%(DisableSpecificWarnings) - ..\..\..\libcommon\lib\common-d.lib;odb-__value__(database)-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) + $(SolutionDir)\..\..\libcommon\lib\common-d.lib;odb-__value__(database)-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) Console true @@ -105,11 +105,11 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) - ..\..\..\libcommon + $(SolutionDir)\..\..\libcommon 4068;4355;4800;4290;%(DisableSpecificWarnings) - ..\..\..\libcommon\lib64\common-d.lib;odb-__value__(database)-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) + $(SolutionDir)\..\..\libcommon\lib64\common-d.lib;odb-__value__(database)-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) Console true @@ -123,11 +123,11 @@ true true WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) - ..\..\..\libcommon + $(SolutionDir)\..\..\libcommon 4068;4355;4800;4290;%(DisableSpecificWarnings) - ..\..\..\libcommon\lib\common.lib;odb-__value__(database).lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) + $(SolutionDir)\..\..\libcommon\lib\common.lib;odb-__value__(database).lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) Console true true @@ -143,11 +143,11 @@ true true WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) - ..\..\..\libcommon + $(SolutionDir)\..\..\libcommon 4068;4355;4800;4290;%(DisableSpecificWarnings) - ..\..\..\libcommon\lib64\common.lib;odb-__value__(database).lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) + $(SolutionDir)\..\..\libcommon\lib64\common.lib;odb-__value__(database).lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) Console true true @@ -158,7 +158,7 @@ __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..\..\..\libcommon)) 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) diff --git a/boost/common/template/template-vc9.vcproj b/boost/common/template/template-vc9.vcproj index e024770..b22262b 100644 --- a/boost/common/template/template-vc9.vcproj +++ b/boost/common/template/template-vc9.vcproj @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="0" - AdditionalIncludeDirectories="..\..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\..\libcommon" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -65,7 +65,7 @@ />