- Timestamp:
- Oct 15, 2011 10:47:53 AM (9 years ago)
- Location:
- stable/2.7
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
stable/2.7
-
stable/2.7/Cbc
- Property svn:mergeinfo changed
/trunk/Cbc merged: 1739
- Property svn:mergeinfo changed
-
stable/2.7/Cbc/Makefile.am
r1715 r1740 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.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
r1715 r1740 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.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
Note: See TracChangeset
for help on using the changeset viewer.