Changeset 1715 for stable/2.7
- Timestamp:
- Aug 14, 2011 7:26:42 AM (10 years ago)
- Location:
- stable/2.7
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
stable/2.7
- Property svn:mergeinfo changed
/trunk merged: 1695,1697,1705,1710,1712-1714
- Property svn:mergeinfo changed
-
stable/2.7/Cbc
- Property svn:mergeinfo changed
/trunk/Cbc merged: 1695,1705,1710,1712-1714
- Property svn:mergeinfo changed
-
stable/2.7/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcproj
r1709 r1715 46 46 Name="VCCLCompilerTool" 47 47 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" 49 49 PreprocessorDefinitions="CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS" 50 50 RuntimeLibrary="3" … … 148 148 ConfigurationType="4" 149 149 CharacterSet="1" 150 ManagedExtensions=" 1"150 ManagedExtensions="0" 151 151 > 152 152 <Tool -
stable/2.7/Cbc/Makefile.am
r1675 r1715 130 130 131 131 addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Cbc 132 132 133 133 install-data-hook: 134 134 @$(mkdir_p) "$(addlibsdir)" … … 138 138 else 139 139 if COIN_CXX_IS_CL 140 echo " /libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs_cpp.txt140 echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs_cpp.txt 141 141 else 142 142 echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt -
stable/2.7/Cbc/Makefile.in
r1675 r1715 979 979 @COIN_HAS_PKGCONFIG_TRUE@ PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \ 980 980 @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.txt981 @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 982 982 @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@ echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt 983 983 -
stable/2.7/Cbc/src/Makefile.am
r1675 r1715 256 256 ClpAmplObjective.hpp 257 257 258 ####################################################################### 259 # Create the Config.h file that has all public defines and install it # 260 ####################################################################### 261 258 262 install-exec-local: 259 263 $(install_sh_DATA) config_cbc.h $(DESTDIR)$(includecoindir)/CbcConfig.h -
stable/2.7/Cbc/src/Makefile.in
r1675 r1715 1266 1266 1267 1267 1268 ####################################################################### 1269 # Create the Config.h file that has all public defines and install it # 1270 ####################################################################### 1271 1268 1272 install-exec-local: 1269 1273 $(install_sh_DATA) config_cbc.h $(DESTDIR)$(includecoindir)/CbcConfig.h -
stable/2.7/Cbc/src/OsiCbc/Makefile.am
r1675 r1715 24 24 # Here list all include flags, relative to this "srcdir" directory. This 25 25 # "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)/..` 26 AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` $(COINDEPEND_CFLAGS) 33 27 34 28 # Plus the appropriate include directories for the default solver. -
stable/2.7/Cbc/src/OsiCbc/Makefile.in
r1675 r1715 440 440 # Here list all include flags, relative to this "srcdir" directory. This 441 441 # "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)/..` \ 442 AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` $(COINDEPEND_CFLAGS) \ 447 443 $(am__append_1) $(am__append_2) $(am__append_3) \ 448 444 $(am__append_4) $(am__append_5) $(am__append_6) \ -
stable/2.7/Cbc/test/Makefile.am
r1675 r1715 81 81 $(CBCLIB_DEPENDENCIES) $(OSITESTS_DEPENDENCIES) 82 82 83 AM_CPPFLAGS += $(OSITESTS_CFLAGS) \ 84 -I`$(CYGPATH_W) $(srcdir)/../src/OsiCbc` 83 AM_CPPFLAGS += -I`$(CYGPATH_W) $(srcdir)/../src/OsiCbc` $(OSITESTS_CFLAGS) 85 84 86 85 ositests: osiUnitTest$(EXEEXT) -
stable/2.7/Cbc/test/Makefile.in
r1675 r1715 418 418 AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../src` $(COINDEPEND_CFLAGS) \ 419 419 $(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) 422 422 423 423 # This line is necessary to allow VPATH compilation
Note: See TracChangeset
for help on using the changeset viewer.