- Timestamp:
- Aug 14, 2011 6:42:40 AM (9 years ago)
- Location:
- trunk/Clp
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Clp/Makefile.am
r1675 r1781 124 124 else 125 125 if COIN_CXX_IS_CL 126 echo " /libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs_cpp.txt126 echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs_cpp.txt 127 127 else 128 128 echo -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/clp_addlibs.txt -
trunk/Clp/Makefile.in
r1734 r1781 904 904 @COIN_HAS_PKGCONFIG_TRUE@ PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \ 905 905 @COIN_HAS_PKGCONFIG_TRUE@ $(PKG_CONFIG) --libs clp > $(addlibsdir)/clp_addlibs.txt 906 @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo " /libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs_cpp.txt906 @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs_cpp.txt 907 907 @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@ echo -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/clp_addlibs.txt 908 908 -
trunk/Clp/src/OsiClp/Makefile.am
r1734 r1781 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 AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) \ 29 -I`$(CYGPATH_W) $(srcdir)/..` 26 AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` $(COINUTILS_CFLAGS) $(OSI_CFLAGS) 30 27 31 28 # This line is necessary to allow VPATH compilation … … 37 34 38 35 # Here list all the header files that are required by a user of the library, 39 # and that therefore should be installed in 'include dir/coin'36 # and that therefore should be installed in 'include/coin' 40 37 includecoindir = $(includedir)/coin 41 38 includecoin_HEADERS = OsiClpSolverInterface.hpp -
trunk/Clp/src/OsiClp/Makefile.in
r1734 r1781 360 360 # Here list all include flags, relative to this "srcdir" directory. This 361 361 # "cygpath" stuff is necessary to compile with native compilers on Windows. 362 # "top_srcdir" refers to the basic directory for the main package that is 363 # being compiled. 364 AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) \ 365 -I`$(CYGPATH_W) $(srcdir)/..` 366 362 AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` $(COINUTILS_CFLAGS) $(OSI_CFLAGS) 367 363 368 364 # This line is necessary to allow VPATH compilation … … 374 370 375 371 # Here list all the header files that are required by a user of the library, 376 # and that therefore should be installed in 'include dir/coin'372 # and that therefore should be installed in 'include/coin' 377 373 includecoindir = $(includedir)/coin 378 374 includecoin_HEADERS = OsiClpSolverInterface.hpp -
trunk/Clp/test/Makefile.am
r1655 r1781 25 25 $(CLPLIB_DEPENDENCIES) $(OSICLP_DEPENDENCIES) $(OSITESTS_DEPENDENCIES) 26 26 27 AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS)\27 AM_CPPFLAGS = \ 28 28 -I`$(CYGPATH_W) $(srcdir)/../src` \ 29 -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp` 29 -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp` \ 30 $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS) 30 31 31 32 testdepend = osiUnitTest$(EXEEXT) -
trunk/Clp/test/Makefile.in
r1734 r1781 341 341 @COIN_HAS_OSITESTS_TRUE@ $(CLPLIB_DEPENDENCIES) $(OSICLP_DEPENDENCIES) $(OSITESTS_DEPENDENCIES) 342 342 343 @COIN_HAS_OSITESTS_TRUE@AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS)\343 @COIN_HAS_OSITESTS_TRUE@AM_CPPFLAGS = \ 344 344 @COIN_HAS_OSITESTS_TRUE@ -I`$(CYGPATH_W) $(srcdir)/../src` \ 345 @COIN_HAS_OSITESTS_TRUE@ -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp` 345 @COIN_HAS_OSITESTS_TRUE@ -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp` \ 346 @COIN_HAS_OSITESTS_TRUE@ $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS) 346 347 347 348 @COIN_HAS_OSITESTS_TRUE@testdepend = osiUnitTest$(EXEEXT)
Note: See TracChangeset
for help on using the changeset viewer.