Changeset 1765


Ignore:
Timestamp:
Jul 16, 2011 6:49:54 AM (8 years ago)
Author:
stefan
Message:

merge chgset 1764 from trunk

Location:
stable/1.14
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • stable/1.14

    • Property svn:mergeinfo changed
      /trunkmerged: 1764
  • stable/1.14/Clp/MSVisualStudio/v10/OsiClpUnitTest/OsiClpUnitTest.vcxproj

    r1753 r1765  
    142142      <IntrinsicFunctions>true</IntrinsicFunctions>
    143143      <AdditionalIncludeDirectories>..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Osi\src\OsiCommonTest;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    144       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;COIN_MSVS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     144      <PreprocessorDefinitions>OSI_BUILD;WIN32;NDEBUG;_CONSOLE;COIN_MSVS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    145145      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    146146      <FunctionLevelLinking>true</FunctionLevelLinking>
  • stable/1.14/Clp/MSVisualStudio/v10/clp/clp.vcxproj

    r1753 r1765  
    6666  <PropertyGroup>
    6767    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    68     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
    69     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
     68    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     69    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    7070    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
    7171    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    7272    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    7373    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
    74     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
    75     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
     74    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     75    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    7676    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
    7777    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     
    124124      </DataExecutionPrevention>
    125125      <TargetMachine>MachineX86</TargetMachine>
    126       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
     126      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    127127      <AdditionalDependencies>libCoinUtils.lib;libClp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    128128    </Link>
     
    141141      <Optimization>Disabled</Optimization>
    142142      <AdditionalIncludeDirectories>..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    143       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;COIN_MSVS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     143      <PreprocessorDefinitions>CLP_BUILD;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;COIN_MSVS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    144144      <MinimalRebuild>true</MinimalRebuild>
    145145      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     
    165165      </DataExecutionPrevention>
    166166      <TargetMachine>MachineX64</TargetMachine>
    167       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
     167      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    168168      <AdditionalDependencies>libCoinUtils.lib;libClp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    169169    </Link>
     
    182182      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
    183183      <AdditionalIncludeDirectories>..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    184       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;COIN_MSVS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     184      <PreprocessorDefinitions>CLP_BUILD;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;COIN_MSVS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    185185      <StringPooling>true</StringPooling>
    186186      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     
    204204      </DataExecutionPrevention>
    205205      <TargetMachine>MachineX86</TargetMachine>
    206       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
     206      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    207207      <AdditionalDependencies>libCoinUtils.lib;libClp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    208208    </Link>
     
    222222      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
    223223      <AdditionalIncludeDirectories>..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    224       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;COIN_MSVS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     224      <PreprocessorDefinitions>CLP_BUILD;WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;COIN_MSVS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    225225      <StringPooling>true</StringPooling>
    226226      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     
    244244      </DataExecutionPrevention>
    245245      <TargetMachine>MachineX64</TargetMachine>
    246       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
     246      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    247247      <AdditionalDependencies>libCoinUtils.lib;libClp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    248248    </Link>
     
    338338    <ClInclude Include="..\..\..\src\MyMessageHandler.hpp" />
    339339  </ItemGroup>
    340   <ItemGroup>
    341     <ProjectReference Include="..\..\..\..\CoinUtils\MSVisualStudio\v10\libCoinUtils\libCoinUtils.vcxproj">
    342       <Project>{c4867f15-438d-4ff8-8388-62fbaaa9786c}</Project>
    343       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    344     </ProjectReference>
    345     <ProjectReference Include="..\libClp\libClp.vcxproj">
    346       <Project>{4f8f7d1c-3a9e-444d-8ee9-77f33fa05994}</Project>
    347       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    348     </ProjectReference>
    349   </ItemGroup>
    350340  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    351341  <ImportGroup Label="ExtensionTargets">
  • stable/1.14/Clp/MSVisualStudio/v10/libClp/libClp.vcxproj

    r1753 r1765  
    6666  <PropertyGroup>
    6767    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    68     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
    69     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
    70     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
    71     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
     68    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     69    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     70    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     71    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    7272    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    7373    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     
    116116      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
    117117      <AdditionalIncludeDirectories>..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    118       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     118      <PreprocessorDefinitions>CLP_BUILD;WIN32;WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    119119      <StringPooling>true</StringPooling>
    120120      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     
    142142      <Optimization>Disabled</Optimization>
    143143      <AdditionalIncludeDirectories>..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    144       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     144      <PreprocessorDefinitions>CLP_BUILD;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    145145      <MinimalRebuild>true</MinimalRebuild>
    146146      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     
    170170      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
    171171      <AdditionalIncludeDirectories>..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    172       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     172      <PreprocessorDefinitions>CLP_BUILD;WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    173173      <StringPooling>true</StringPooling>
    174174      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     
    940940    <ClInclude Include="..\..\..\src\Idiot.hpp" />
    941941  </ItemGroup>
     942  <ItemGroup>
     943    <None Include="..\..\..\..\CoinUtils\MSVisualStudio\v10\libCoinUtils\libCoinUtils.vcxproj" />
     944  </ItemGroup>
    942945  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    943946  <ImportGroup Label="ExtensionTargets">
  • stable/1.14/Clp/MSVisualStudio/v10/libOsiClp/libOsiClp.vcxproj

    r1753 r1765  
    6666  <PropertyGroup>
    6767    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
    68     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
    69     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
    70     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
    71     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
     68    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     69    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
     70    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     71    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    7272    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    7373    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     
    113113      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
    114114      <AdditionalIncludeDirectories>..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    115       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     115      <PreprocessorDefinitions>OSI_BUILD;WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    116116      <StringPooling>true</StringPooling>
    117117      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     
    136136      <Optimization>Disabled</Optimization>
    137137      <AdditionalIncludeDirectories>..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    138       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     138      <PreprocessorDefinitions>OSI_BUILD;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    139139      <MinimalRebuild>true</MinimalRebuild>
    140140      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     
    161161      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
    162162      <AdditionalIncludeDirectories>..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src;..\..\..\..\Osi\src\Osi;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    163       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     163      <PreprocessorDefinitions>OSI_BUILD;WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    164164      <StringPooling>true</StringPooling>
    165165      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  • stable/1.14/Clp/src

  • stable/1.14/Clp/src/config_default.h

    r1753 r1765  
    1919/* Define to 1 if the CoinUtils package is used */
    2020#define COIN_HAS_COINUTILS 1
     21
     22/* Define to 1 if Clp is used */
     23#define COIN_HAS_CLP 1
Note: See TracChangeset for help on using the changeset viewer.