|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r75297 - in trunk/libs/geometry/test_extensions: . algorithms gis/latlong
From: barend.gehrels_at_[hidden]
Date: 2011-11-04 06:32:08
Author: barendgehrels
Date: 2011-11-04 06:32:06 EDT (Fri, 04 Nov 2011)
New Revision: 75297
URL: http://svn.boost.org/trac/boost/changeset/75297
Log:
Fixed test_extensions folder/projects
Added:
trunk/libs/geometry/test_extensions/boost.vsprops (contents, props changed)
trunk/libs/geometry/test_extensions/ttmath.vsprops (contents, props changed)
Text files modified:
trunk/libs/geometry/test_extensions/algorithms/connect.cpp | 1 -
trunk/libs/geometry/test_extensions/algorithms/connect.vcproj | 4 ++--
trunk/libs/geometry/test_extensions/algorithms/dissolve.vcproj | 4 ++--
trunk/libs/geometry/test_extensions/algorithms/mark_spikes.vcproj | 4 ++--
trunk/libs/geometry/test_extensions/algorithms/midpoints.vcproj | 13 +++++++++----
trunk/libs/geometry/test_extensions/algorithms/offset.cpp | 4 +---
trunk/libs/geometry/test_extensions/algorithms/offset.vcproj | 4 ++--
trunk/libs/geometry/test_extensions/algorithms/remove_holes_if.vcproj | 4 ++--
trunk/libs/geometry/test_extensions/algorithms/selected.vcproj | 13 +++++++++----
trunk/libs/geometry/test_extensions/gis/latlong/latlong.sln | 6 ++++++
10 files changed, 35 insertions(+), 22 deletions(-)
Modified: trunk/libs/geometry/test_extensions/algorithms/connect.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/connect.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/connect.cpp 2011-11-04 06:32:06 EDT (Fri, 04 Nov 2011)
@@ -30,7 +30,6 @@
#if defined(TEST_WITH_SVG)
# include <boost/geometry/multi/algorithms/envelope.hpp>
-# include <boost/geometry/multi/core/is_multi.hpp>
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
#endif
Modified: trunk/libs/geometry/test_extensions/algorithms/connect.vcproj
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/connect.vcproj (original)
+++ trunk/libs/geometry/test_extensions/algorithms/connect.vcproj 2011-11-04 06:32:06 EDT (Fri, 04 Nov 2011)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../..;..;."
+ AdditionalIncludeDirectories="../../../..;..;.;../../test"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_GEOMETRY_TEST_MULTI_PERMUTATIONS___disabled"
ExceptionHandling="2"
RuntimeLibrary="1"
@@ -114,7 +114,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;..;."
+ AdditionalIncludeDirectories="../../../..;..;.;../../test"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
ExceptionHandling="2"
UsePrecompiledHeader="0"
Modified: trunk/libs/geometry/test_extensions/algorithms/dissolve.vcproj
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/dissolve.vcproj (original)
+++ trunk/libs/geometry/test_extensions/algorithms/dissolve.vcproj 2011-11-04 06:32:06 EDT (Fri, 04 Nov 2011)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../..;..;."
+ AdditionalIncludeDirectories="../../../..;..;.;../../test"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
ExceptionHandling="2"
RuntimeLibrary="1"
@@ -114,7 +114,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;..;."
+ AdditionalIncludeDirectories="../../../..;..;.;../../test"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
ExceptionHandling="2"
UsePrecompiledHeader="0"
Modified: trunk/libs/geometry/test_extensions/algorithms/mark_spikes.vcproj
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/mark_spikes.vcproj (original)
+++ trunk/libs/geometry/test_extensions/algorithms/mark_spikes.vcproj 2011-11-04 06:32:06 EDT (Fri, 04 Nov 2011)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;../../../..;.."
+ AdditionalIncludeDirectories=".;../../../..;..;../../test"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
ExceptionHandling="2"
RuntimeLibrary="1"
@@ -114,7 +114,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../../../..;.."
+ AdditionalIncludeDirectories=".;../../../..;..;../../test"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
ExceptionHandling="2"
UsePrecompiledHeader="0"
Modified: trunk/libs/geometry/test_extensions/algorithms/midpoints.vcproj
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/midpoints.vcproj (original)
+++ trunk/libs/geometry/test_extensions/algorithms/midpoints.vcproj 2011-11-04 06:32:06 EDT (Fri, 04 Nov 2011)
@@ -6,7 +6,6 @@
ProjectGUID="{CE23DFB5-0705-4F13-9FAB-C97F903B3F96}"
RootNamespace="midpoints"
Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -42,10 +41,10 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
+ AdditionalIncludeDirectories="../../../..;..;../../test"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- RuntimeLibrary="1"
ExceptionHandling="2"
+ RuntimeLibrary="1"
UsePrecompiledHeader="0"
DebugInformationFormat="1"
/>
@@ -83,6 +82,9 @@
Name="VCAppVerifierTool"
/>
<Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -112,7 +114,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
+ AdditionalIncludeDirectories="../../../..;..;../../test"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
ExceptionHandling="2"
UsePrecompiledHeader="0"
@@ -152,6 +154,9 @@
Name="VCAppVerifierTool"
/>
<Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
Modified: trunk/libs/geometry/test_extensions/algorithms/offset.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/offset.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/offset.cpp 2011-11-04 06:32:06 EDT (Fri, 04 Nov 2011)
@@ -23,13 +23,11 @@
#include <boost/geometry/strategies/strategies.hpp>
-NOTE: this unit test currently does not compile, it should be updated first.
-#include <boost/geometry/strategies/buffer.hpp>
+#include <boost/geometry/extensions/strategies/buffer.hpp>
#if defined(TEST_WITH_SVG)
# include <boost/geometry/multi/algorithms/envelope.hpp>
-# include <boost/geometry/multi/core/is_multi.hpp>
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
#endif
Modified: trunk/libs/geometry/test_extensions/algorithms/offset.vcproj
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/offset.vcproj (original)
+++ trunk/libs/geometry/test_extensions/algorithms/offset.vcproj 2011-11-04 06:32:06 EDT (Fri, 04 Nov 2011)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../..;..;."
+ AdditionalIncludeDirectories="../../../..;..;.;../../test"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
ExceptionHandling="2"
RuntimeLibrary="1"
@@ -114,7 +114,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;..;."
+ AdditionalIncludeDirectories="../../../..;..;.;../../test"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
ExceptionHandling="2"
UsePrecompiledHeader="0"
Modified: trunk/libs/geometry/test_extensions/algorithms/remove_holes_if.vcproj
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/remove_holes_if.vcproj (original)
+++ trunk/libs/geometry/test_extensions/algorithms/remove_holes_if.vcproj 2011-11-04 06:32:06 EDT (Fri, 04 Nov 2011)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
+ AdditionalIncludeDirectories="../../../..;..;../../test"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
ExceptionHandling="2"
RuntimeLibrary="1"
@@ -114,7 +114,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
+ AdditionalIncludeDirectories="../../../..;..;../../test"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
ExceptionHandling="2"
UsePrecompiledHeader="0"
Modified: trunk/libs/geometry/test_extensions/algorithms/selected.vcproj
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/selected.vcproj (original)
+++ trunk/libs/geometry/test_extensions/algorithms/selected.vcproj 2011-11-04 06:32:06 EDT (Fri, 04 Nov 2011)
@@ -6,7 +6,6 @@
ProjectGUID="{22DD12E5-4AAD-4066-9C4F-4C360F7759AA}"
RootNamespace="selected"
Keyword="Win32Proj"
- TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -42,10 +41,10 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../..;.."
+ AdditionalIncludeDirectories="../../../..;..;../../test"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- RuntimeLibrary="1"
ExceptionHandling="2"
+ RuntimeLibrary="1"
UsePrecompiledHeader="0"
DebugInformationFormat="1"
/>
@@ -83,6 +82,9 @@
Name="VCAppVerifierTool"
/>
<Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -112,7 +114,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../..;.."
+ AdditionalIncludeDirectories="../../../..;..;../../test"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
ExceptionHandling="2"
UsePrecompiledHeader="0"
@@ -152,6 +154,9 @@
Name="VCAppVerifierTool"
/>
<Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
Added: trunk/libs/geometry/test_extensions/boost.vsprops
==============================================================================
--- (empty file)
+++ trunk/libs/geometry/test_extensions/boost.vsprops 2011-11-04 06:32:06 EDT (Fri, 04 Nov 2011)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="boost"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(BOOST_ROOT)";../../.."
+ PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
+ WarningLevel="3"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalLibraryDirectories="$(BOOST_ROOT)\lib"
+ />
+ <UserMacro
+ Name="BOOST_ROOT"
+ Value="../../.."
+ />
+</VisualStudioPropertySheet>
Modified: trunk/libs/geometry/test_extensions/gis/latlong/latlong.sln
==============================================================================
--- trunk/libs/geometry/test_extensions/gis/latlong/latlong.sln (original)
+++ trunk/libs/geometry/test_extensions/gis/latlong/latlong.sln 2011-11-04 06:32:06 EDT (Fri, 04 Nov 2011)
@@ -17,6 +17,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cross_track", "cross_track.vcproj", "{572678FB-A286-4F68-B2D5-F9C9EAC392FE}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "area_geo", "area_geo.vcproj", "{C18C6BFA-B0CF-488B-BED0-92AF41CE4BE8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -55,6 +57,10 @@
{572678FB-A286-4F68-B2D5-F9C9EAC392FE}.Debug|Win32.Build.0 = Debug|Win32
{572678FB-A286-4F68-B2D5-F9C9EAC392FE}.Release|Win32.ActiveCfg = Release|Win32
{572678FB-A286-4F68-B2D5-F9C9EAC392FE}.Release|Win32.Build.0 = Release|Win32
+ {C18C6BFA-B0CF-488B-BED0-92AF41CE4BE8}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C18C6BFA-B0CF-488B-BED0-92AF41CE4BE8}.Debug|Win32.Build.0 = Debug|Win32
+ {C18C6BFA-B0CF-488B-BED0-92AF41CE4BE8}.Release|Win32.ActiveCfg = Release|Win32
+ {C18C6BFA-B0CF-488B-BED0-92AF41CE4BE8}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Added: trunk/libs/geometry/test_extensions/ttmath.vsprops
==============================================================================
--- (empty file)
+++ trunk/libs/geometry/test_extensions/ttmath.vsprops 2011-11-04 06:32:06 EDT (Fri, 04 Nov 2011)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="ttmath"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(TTMATH_ROOT)";"../$(TTMATH_ROOT)";"../../$(TTMATH_ROOT)""
+ PreprocessorDefinitions="HAVE_TTMATH"
+ />
+ <UserMacro
+ Name="TTMATH_ROOT"
+ Value="..\..\..\boost\geometry\extensions\contrib\ttmath"
+ />
+</VisualStudioPropertySheet>
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk