Changeset 1674 for trunk/Cbc/MSVisualStudio/v9

Timestamp:

Jun 19, 2011 12:57:59 PM (10 years ago)

Author:

stefan

Message:

merge chgset 1588 from stable/2.7; back to all-stables in externals; rerun autotools

Location:

trunk

Files:

• . (modified) (2 props)
• Cbc (modified) (1 prop)
• Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcproj (modified) (4 diffs)
• Cbc/MSVisualStudio/v9/libOsiCbc/libOsiCbc.vcproj (modified) (4 diffs)

trunk

@@ -1 @@
-BuildTools        https://projects.coin-or.org/svn/BuildTools/trunk
+BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.7
 ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
 ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
-ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
+ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
 ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
 ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
 Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
 Data/miplib3      https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
-CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
-Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
-Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
-Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
+CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
+Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
+Clp               https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
+Osi               https://projects.coin-or.org/svn/Osi/stable/0.105/Osi

@@ -1 @@
-BuildTools        https://projects.coin-or.org/svn/BuildTools/trunk
+BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.7
 ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
 ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
-ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
+ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
 ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
 ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
 Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
 Data/miplib3      https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
-CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
-Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
-Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
-Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
+CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
+Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
+Clp               https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
+Osi               https://projects.coin-or.org/svn/Osi/stable/0.105/Osi

trunk/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcproj

@@ -108 +108 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp"
+                                AdditionalIncludeDirectories="..\..\..\src;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglResidualCapacity"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS"
                                 RuntimeLibrary="3"
@@ -150 +150 @@
                         CharacterSet="1"
                         ManagedExtensions="0"
-                        WholeProgramOptimization="1"
+                        WholeProgramOptimization="0"
                         >
                         <Tool
@@ -169 +169 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CRT_SECURE_NO_WARNINGS"
+                                AdditionalIncludeDirectories="..\..\..\src\;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS"
                                 RuntimeLibrary="2"
                                 UsePrecompiledHeader="0"
@@ -211 +211 @@
                         CharacterSet="1"
                         ManagedExtensions="0"
-                        WholeProgramOptimization="1"
+                        WholeProgramOptimization="0"
                         >
                         <Tool

trunk/Cbc/MSVisualStudio/v9/libOsiCbc/libOsiCbc.vcproj

@@ -108 +108 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi"
+                                AdditionalIncludeDirectories="..\..\..\..\Osi\src\Osi;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\src"
                                 PreprocessorDefinitions="WIN32;_DEBUG"
                                 RuntimeLibrary="3"
@@ -150 +150 @@
                         CharacterSet="1"
                         ManagedExtensions="0"
-                        WholeProgramOptimization="1"
+                        WholeProgramOptimization="0"
                         >
                         <Tool
@@ -169 +169 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src\Osi"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE"
+                                AdditionalIncludeDirectories="..\..\..\..\Osi\src\Osi;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\src"
+                                PreprocessorDefinitions="WIN32;NDEBUG"
                                 RuntimeLibrary="2"
                                 UsePrecompiledHeader="0"
@@ -211 +211 @@
                         CharacterSet="1"
                         ManagedExtensions="0"
-                        WholeProgramOptimization="1"
+                        WholeProgramOptimization="0"
                         >
                         <Tool

@@ -1 @@
-BuildTools        https://projects.coin-or.org/svn/BuildTools/trunk
+BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.7
 ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
 ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
-ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
+ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
 ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
 ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
 Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
 Data/miplib3      https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
-CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
-Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
-Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
-Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
+CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
+Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
+Clp               https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
+Osi               https://projects.coin-or.org/svn/Osi/stable/0.105/Osi