Changeset 2148


Ignore:
Timestamp:
Jun 22, 2015 12:14:57 PM (3 years ago)
Author:
tkr
Message:

Merging 2147 from trunk

Location:
stable/1.16/Clp
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • stable/1.16/Clp

  • stable/1.16/Clp/MSVisualStudio/v10/clp/clp.vcxproj

    r2031 r2148  
    1 <?xml version="1.0" encoding="utf-8"?>
    2 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     1<?xml version="1.0" encoding="utf-8"?>
     2<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
    44    <ProjectConfiguration Include="Debug|Win32">
     
    2626  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2727    <ConfigurationType>Application</ConfigurationType>
     28    <PlatformToolset>v120</PlatformToolset>
    2829  </PropertyGroup>
    2930  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3031    <ConfigurationType>Application</ConfigurationType>
     32    <PlatformToolset>v120</PlatformToolset>
    3133  </PropertyGroup>
    3234  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3335    <ConfigurationType>Application</ConfigurationType>
     36    <PlatformToolset>v120</PlatformToolset>
    3437  </PropertyGroup>
    3538  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    3639    <ConfigurationType>Application</ConfigurationType>
     40    <PlatformToolset>v120</PlatformToolset>
    3741  </PropertyGroup>
    3842  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  • stable/1.16/Clp/MSVisualStudio/v10/libClp/libClp.vcxproj

    r1934 r2148  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
    44    <ProjectConfiguration Include="Debug|Win32">
     
    2626  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2727    <ConfigurationType>StaticLibrary</ConfigurationType>
     28    <PlatformToolset>v120</PlatformToolset>
    2829  </PropertyGroup>
    2930  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3031    <ConfigurationType>StaticLibrary</ConfigurationType>
     32    <PlatformToolset>v120</PlatformToolset>
    3133  </PropertyGroup>
    3234  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3335    <ConfigurationType>StaticLibrary</ConfigurationType>
     36    <PlatformToolset>v120</PlatformToolset>
    3437  </PropertyGroup>
    3538  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    3639    <ConfigurationType>StaticLibrary</ConfigurationType>
     40    <PlatformToolset>v120</PlatformToolset>
    3741  </PropertyGroup>
    3842  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  • stable/1.16/Clp/MSVisualStudio/v10/libOsiClp/libOsiClp.vcxproj

    r1934 r2148  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
    44    <ProjectConfiguration Include="Debug|Win32">
     
    2626  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    2727    <ConfigurationType>StaticLibrary</ConfigurationType>
     28    <PlatformToolset>v120</PlatformToolset>
    2829  </PropertyGroup>
    2930  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    3031    <ConfigurationType>StaticLibrary</ConfigurationType>
     32    <PlatformToolset>v120</PlatformToolset>
    3133  </PropertyGroup>
    3234  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    3335    <ConfigurationType>StaticLibrary</ConfigurationType>
     36    <PlatformToolset>v120</PlatformToolset>
    3437  </PropertyGroup>
    3538  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    3639    <ConfigurationType>StaticLibrary</ConfigurationType>
     40    <PlatformToolset>v120</PlatformToolset>
    3741  </PropertyGroup>
    3842  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  • stable/1.16/Clp/src

  • stable/1.16/Clp/src/CbcOrClpParam.cpp

    r2079 r2148  
    4949#endif
    5050static bool doPrinting = true;
    51 std::string afterEquals = "";
     51static std::string afterEquals = "";
    5252static char printArray[200];
    5353#if COIN_INT_MAX==0
Note: See TracChangeset for help on using the changeset viewer.