|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r77206 - in trunk/libs/geometry/example_extensions: . gis/io/shapelib gis/latlong gis/projections
From: barend.gehrels_at_[hidden]
Date: 2012-03-04 06:07:58
Author: barendgehrels
Date: 2012-03-04 06:07:57 EST (Sun, 04 Mar 2012)
New Revision: 77206
URL: http://svn.boost.org/trac/boost/changeset/77206
Log:
[geometry] example_extensions, fixed paths
Added:
trunk/libs/geometry/example_extensions/boost.vsprops (contents, props changed)
Text files modified:
trunk/libs/geometry/example_extensions/gis/io/shapelib/shapelib.cpp | 6 ++++--
trunk/libs/geometry/example_extensions/gis/io/shapelib/shapelib.vcproj | 8 ++++----
trunk/libs/geometry/example_extensions/gis/io/shapelib/shapelib.vsprops | 2 +-
trunk/libs/geometry/example_extensions/gis/latlong/distance_example.vcproj | 8 ++++----
trunk/libs/geometry/example_extensions/gis/latlong/point_ll_example.vcproj | 8 ++++----
trunk/libs/geometry/example_extensions/gis/projections/p01_example.vcproj | 8 ++++----
trunk/libs/geometry/example_extensions/gis/projections/p02_example.vcproj | 8 ++++----
trunk/libs/geometry/example_extensions/gis/projections/p03_example.vcproj | 8 ++++----
8 files changed, 29 insertions(+), 27 deletions(-)
Added: trunk/libs/geometry/example_extensions/boost.vsprops
==============================================================================
--- (empty file)
+++ trunk/libs/geometry/example_extensions/boost.vsprops 2012-03-04 06:07:57 EST (Sun, 04 Mar 2012)
@@ -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/example_extensions/gis/io/shapelib/shapelib.cpp
==============================================================================
--- trunk/libs/geometry/example_extensions/gis/io/shapelib/shapelib.cpp (original)
+++ trunk/libs/geometry/example_extensions/gis/io/shapelib/shapelib.cpp 2012-03-04 06:07:57 EST (Sun, 04 Mar 2012)
@@ -9,8 +9,10 @@
#include "shapefil.h"
#include <boost/noncopyable.hpp>
-#include <boost/geometry/geometry.hpp>
-#include <boost/geometry/multi/multi.hpp>
+
+#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/multi/geometries/multi_geometries.hpp>
#include <boost/geometry/extensions/gis/io/shapelib/shape_creator.hpp>
#include <boost/geometry/extensions/gis/io/shapelib/shp_create_object.hpp>
Modified: trunk/libs/geometry/example_extensions/gis/io/shapelib/shapelib.vcproj
==============================================================================
--- trunk/libs/geometry/example_extensions/gis/io/shapelib/shapelib.vcproj (original)
+++ trunk/libs/geometry/example_extensions/gis/io/shapelib/shapelib.vcproj 2012-03-04 06:07:57 EST (Sun, 04 Mar 2012)
@@ -20,7 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\shapelib"
ConfigurationType="1"
- InheritedPropertySheets="..\..\..\..\boost.vsprops;.\shapelib.vsprops"
+ InheritedPropertySheets="..\..\..\boost.vsprops;.\shapelib.vsprops"
CharacterSet="1"
>
<Tool
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../../../../..;../../../.."
+ AdditionalIncludeDirectories="../../../../../..;../../../.."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
ExceptionHandling="2"
RuntimeLibrary="1"
@@ -93,7 +93,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\shapelib"
ConfigurationType="1"
- InheritedPropertySheets="..\..\..\..\boost.vsprops;.\shapelib.vsprops"
+ InheritedPropertySheets="..\..\..\boost.vsprops;.\shapelib.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -114,7 +114,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../../../..;../../../.."
+ AdditionalIncludeDirectories="../../../../../..;../../../.."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
ExceptionHandling="2"
UsePrecompiledHeader="0"
Modified: trunk/libs/geometry/example_extensions/gis/io/shapelib/shapelib.vsprops
==============================================================================
--- trunk/libs/geometry/example_extensions/gis/io/shapelib/shapelib.vsprops (original)
+++ trunk/libs/geometry/example_extensions/gis/io/shapelib/shapelib.vsprops 2012-03-04 06:07:57 EST (Sun, 04 Mar 2012)
@@ -10,6 +10,6 @@
/>
<UserMacro
Name="SHAPELIB"
- Value="../../../../with_external_libs/contrib/shapelib-1.3.0b2"
+ Value="../../../../example/with_external_libs/contrib/shapelib-1.3.0b2"
/>
</VisualStudioPropertySheet>
Modified: trunk/libs/geometry/example_extensions/gis/latlong/distance_example.vcproj
==============================================================================
--- trunk/libs/geometry/example_extensions/gis/latlong/distance_example.vcproj (original)
+++ trunk/libs/geometry/example_extensions/gis/latlong/distance_example.vcproj 2012-03-04 06:07:57 EST (Sun, 04 Mar 2012)
@@ -20,7 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\distance_example"
ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
+ InheritedPropertySheets="..\..\boost.vsprops"
CharacterSet="1"
>
<Tool
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../../../.."
+ AdditionalIncludeDirectories=".;../../../../.."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS"
MinimalRebuild="true"
RuntimeLibrary="3"
@@ -96,7 +96,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\distance_example"
ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
+ InheritedPropertySheets="..\..\boost.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -117,7 +117,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../../.."
+ AdditionalIncludeDirectories=".;../../../../.."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
Modified: trunk/libs/geometry/example_extensions/gis/latlong/point_ll_example.vcproj
==============================================================================
--- trunk/libs/geometry/example_extensions/gis/latlong/point_ll_example.vcproj (original)
+++ trunk/libs/geometry/example_extensions/gis/latlong/point_ll_example.vcproj 2012-03-04 06:07:57 EST (Sun, 04 Mar 2012)
@@ -20,7 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\point_ll_example"
ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
+ InheritedPropertySheets="..\..\boost.vsprops"
CharacterSet="1"
>
<Tool
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../../../.."
+ AdditionalIncludeDirectories=".;../../../../.."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
RuntimeLibrary="3"
@@ -96,7 +96,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\point_ll_example"
ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
+ InheritedPropertySheets="..\..\boost.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -117,7 +117,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../../.."
+ AdditionalIncludeDirectories=".;../../../../.."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
Modified: trunk/libs/geometry/example_extensions/gis/projections/p01_example.vcproj
==============================================================================
--- trunk/libs/geometry/example_extensions/gis/projections/p01_example.vcproj (original)
+++ trunk/libs/geometry/example_extensions/gis/projections/p01_example.vcproj 2012-03-04 06:07:57 EST (Sun, 04 Mar 2012)
@@ -20,7 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\p01_example"
ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
+ InheritedPropertySheets="..\..\boost.vsprops"
CharacterSet="1"
>
<Tool
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../../../.."
+ AdditionalIncludeDirectories=".;../../../../.."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS"
MinimalRebuild="true"
RuntimeLibrary="3"
@@ -95,7 +95,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\p01_example"
ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
+ InheritedPropertySheets="..\..\boost.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -120,7 +120,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
WholeProgramOptimization="false"
- AdditionalIncludeDirectories="../../../../../.."
+ AdditionalIncludeDirectories=".;../../../../.."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS"
GeneratePreprocessedFile="0"
RuntimeLibrary="0"
Modified: trunk/libs/geometry/example_extensions/gis/projections/p02_example.vcproj
==============================================================================
--- trunk/libs/geometry/example_extensions/gis/projections/p02_example.vcproj (original)
+++ trunk/libs/geometry/example_extensions/gis/projections/p02_example.vcproj 2012-03-04 06:07:57 EST (Sun, 04 Mar 2012)
@@ -20,7 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\p02_example"
ConfigurationType="1"
- InheritedPropertySheets="../../../boost.vsprops"
+ InheritedPropertySheets="..\..\boost.vsprops"
CharacterSet="1"
>
<Tool
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../../../..;."
+ AdditionalIncludeDirectories=".;../../../../.."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS"
MinimalRebuild="true"
RuntimeLibrary="3"
@@ -95,7 +95,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\p02_example"
ConfigurationType="1"
- InheritedPropertySheets="../../../boost.vsprops"
+ InheritedPropertySheets="..\..\boost.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -120,7 +120,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
WholeProgramOptimization="false"
- AdditionalIncludeDirectories="../../../../../..;."
+ AdditionalIncludeDirectories=".;../../../../.."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS"
GeneratePreprocessedFile="0"
RuntimeLibrary="0"
Modified: trunk/libs/geometry/example_extensions/gis/projections/p03_example.vcproj
==============================================================================
--- trunk/libs/geometry/example_extensions/gis/projections/p03_example.vcproj (original)
+++ trunk/libs/geometry/example_extensions/gis/projections/p03_example.vcproj 2012-03-04 06:07:57 EST (Sun, 04 Mar 2012)
@@ -20,7 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\p03_example"
ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
+ InheritedPropertySheets="..\..\boost.vsprops"
CharacterSet="1"
>
<Tool
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;../../../../../.."
+ AdditionalIncludeDirectories=".;../../../../.."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS"
MinimalRebuild="true"
RuntimeLibrary="3"
@@ -95,7 +95,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\p03_example"
ConfigurationType="1"
- InheritedPropertySheets="..\..\..\boost.vsprops"
+ InheritedPropertySheets="..\..\boost.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -120,7 +120,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
WholeProgramOptimization="false"
- AdditionalIncludeDirectories=".;../../../../../.."
+ AdditionalIncludeDirectories=".;../../../../.."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS"
GeneratePreprocessedFile="0"
RuntimeLibrary="0"
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