Changeset 1715 for stable/2.7


Ignore:
Timestamp:
Aug 14, 2011 7:26:42 AM (9 years ago)
Author:
stefan
Message:

sync with trunk rev1714

Location:
stable/2.7
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • stable/2.7

  • stable/2.7/Cbc

  • stable/2.7/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcproj

    r1709 r1715  
    4646                                Name="VCCLCompilerTool"
    4747                                Optimization="0"
    48                                 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"
     48                                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"
    4949                                PreprocessorDefinitions="CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS"
    5050                                RuntimeLibrary="3"
    … …  
    148148                        ConfigurationType="4"
    149149                        CharacterSet="1"
    150                         ManagedExtensions="1"
     150                        ManagedExtensions="0"
    151151                        >
    152152                        <Tool

  • stable/2.7/Cbc/Makefile.am

    r1675 r1715  
    130130
    131131addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Cbc
    132        
     132
    133133install-data-hook:
    134134        @$(mkdir_p) "$(addlibsdir)"
    … …  
    138138else
    139139if COIN_CXX_IS_CL
    140         echo "/libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs_cpp.txt
     140        echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs_cpp.txt
    141141else
    142142        echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt

  • stable/2.7/Cbc/Makefile.in

    r1675 r1715  
    979979@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    980980@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs cbc > $(addlibsdir)/cbc_addlibs.txt
    981 @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "/libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs_cpp.txt
     981@COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs_cpp.txt
    982982@COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
    983983

  • stable/2.7/Cbc/src/Makefile.am

    r1675 r1715  
    256256        ClpAmplObjective.hpp
    257257
     258#######################################################################
     259# Create the Config.h file that has all public defines and install it #
     260#######################################################################
     261
    258262install-exec-local:
    259263        $(install_sh_DATA) config_cbc.h $(DESTDIR)$(includecoindir)/CbcConfig.h

  • stable/2.7/Cbc/src/Makefile.in

    r1675 r1715  
    12661266
    12671267
     1268#######################################################################
     1269# Create the Config.h file that has all public defines and install it #
     1270#######################################################################
     1271
    12681272install-exec-local:
    12691273        $(install_sh_DATA) config_cbc.h $(DESTDIR)$(includecoindir)/CbcConfig.h

  • stable/2.7/Cbc/src/OsiCbc/Makefile.am

    r1675 r1715  
    2424# Here list all include flags, relative to this "srcdir" directory.  This
    2525# "cygpath" stuff is necessary to compile with native compilers on Windows.
    26 # "top_srcdir" refers to the basic directory for the main package that is
    27 # being compiled.
    28 
    29 # Needed by any OsiCbc configuration.
    30 
    31 AM_CPPFLAGS = $(COINDEPEND_CFLAGS) \
    32         -I`$(CYGPATH_W) $(srcdir)/..`
     26AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` $(COINDEPEND_CFLAGS)
    3327
    3428# Plus the appropriate include directories for the default solver.

  • stable/2.7/Cbc/src/OsiCbc/Makefile.in

    r1675 r1715  
    440440# Here list all include flags, relative to this "srcdir" directory.  This
    441441# "cygpath" stuff is necessary to compile with native compilers on Windows.
    442 # "top_srcdir" refers to the basic directory for the main package that is
    443 # being compiled.
    444 
    445 # Needed by any OsiCbc configuration.
    446 AM_CPPFLAGS = $(COINDEPEND_CFLAGS) -I`$(CYGPATH_W) $(srcdir)/..` \
     442AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` $(COINDEPEND_CFLAGS) \
    447443        $(am__append_1) $(am__append_2) $(am__append_3) \
    448444        $(am__append_4) $(am__append_5) $(am__append_6) \

  • stable/2.7/Cbc/test/Makefile.am

    r1675 r1715  
    8181    $(CBCLIB_DEPENDENCIES) $(OSITESTS_DEPENDENCIES)
    8282
    83 AM_CPPFLAGS += $(OSITESTS_CFLAGS) \
    84         -I`$(CYGPATH_W) $(srcdir)/../src/OsiCbc`
     83AM_CPPFLAGS += -I`$(CYGPATH_W) $(srcdir)/../src/OsiCbc` $(OSITESTS_CFLAGS)
    8584
    8685ositests: osiUnitTest$(EXEEXT)

  • stable/2.7/Cbc/test/Makefile.in

    r1675 r1715  
    418418AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../src` $(COINDEPEND_CFLAGS) \
    419419        $(CLP_CFLAGS) $(CPX_CFLAGS) $(DYLP_CFLAGS) $(GLPK_CFLAGS) \
    420         $(MSK_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS) $(OSITESTS_CFLAGS) \
    421         -I`$(CYGPATH_W) $(srcdir)/../src/OsiCbc`
     420        $(MSK_CFLAGS) $(VOL_CFLAGS) $(XPR_CFLAGS) -I`$(CYGPATH_W) \
     421        $(srcdir)/../src/OsiCbc` $(OSITESTS_CFLAGS)
    422422
    423423# This line is necessary to allow VPATH compilation
Note: See TracChangeset for help on using the changeset viewer.