Changeset 1781 for trunk

Timestamp:

Aug 14, 2011 6:42:40 AM (9 years ago)

Author:

stefan

Message:

fix order of -I flags, so uninstalled headers are prefered to installed ones in case headers of dependencies are in installation directory; fix addlibs file for cl

Location:

trunk/Clp

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• src/OsiClp/Makefile.am (modified) (2 diffs)
• src/OsiClp/Makefile.in (modified) (2 diffs)
• test/Makefile.am (modified) (1 diff)
• test/Makefile.in (modified) (1 diff)

trunk/Clp/Makefile.am

@@ -124 +124 @@
 else
 if COIN_CXX_IS_CL
-        echo "/libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs_cpp.txt
+        echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs_cpp.txt
 else
         echo -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/clp_addlibs.txt

trunk/Clp/Makefile.in

@@ -904 +904 @@
 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
 @COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs clp > $(addlibsdir)/clp_addlibs.txt
-@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
+@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
 @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/clp_addlibs.txt
 

trunk/Clp/src/OsiClp/Makefile.am

@@ -24 +24 @@
 # Here list all include flags, relative to this "srcdir" directory.  This
 # "cygpath" stuff is necessary to compile with native compilers on Windows.
-# "top_srcdir" refers to the basic directory for the main package that is
-# being compiled.
-AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) \
-        -I`$(CYGPATH_W) $(srcdir)/..`
+AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` $(COINUTILS_CFLAGS) $(OSI_CFLAGS)
 
 # This line is necessary to allow VPATH compilation
@@ -37 +34 @@
 
 # Here list all the header files that are required by a user of the library,
-# and that therefore should be installed in 'includedir/coin'
+# and that therefore should be installed in 'include/coin'
 includecoindir = $(includedir)/coin
 includecoin_HEADERS = OsiClpSolverInterface.hpp

trunk/Clp/src/OsiClp/Makefile.in

@@ -360 +360 @@
 # Here list all include flags, relative to this "srcdir" directory.  This
 # "cygpath" stuff is necessary to compile with native compilers on Windows.
-# "top_srcdir" refers to the basic directory for the main package that is
-# being compiled.
-AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) \
-        -I`$(CYGPATH_W) $(srcdir)/..`
-
+AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/..` $(COINUTILS_CFLAGS) $(OSI_CFLAGS)
 
 # This line is necessary to allow VPATH compilation
@@ -374 +370 @@
 
 # Here list all the header files that are required by a user of the library,
-# and that therefore should be installed in 'includedir/coin'
+# and that therefore should be installed in 'include/coin'
 includecoindir = $(includedir)/coin
 includecoin_HEADERS = OsiClpSolverInterface.hpp

trunk/Clp/test/Makefile.am

@@ -25 +25 @@
   $(CLPLIB_DEPENDENCIES) $(OSICLP_DEPENDENCIES) $(OSITESTS_DEPENDENCIES)
 
-AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS) \
+AM_CPPFLAGS = \
         -I`$(CYGPATH_W) $(srcdir)/../src` \
-        -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp`
+        -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp` \
+        $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS)
 
 testdepend =  osiUnitTest$(EXEEXT)

trunk/Clp/test/Makefile.in

@@ -341 +341 @@
 @COIN_HAS_OSITESTS_TRUE@  $(CLPLIB_DEPENDENCIES) $(OSICLP_DEPENDENCIES) $(OSITESTS_DEPENDENCIES)
 
-@COIN_HAS_OSITESTS_TRUE@AM_CPPFLAGS = $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS) \
+@COIN_HAS_OSITESTS_TRUE@AM_CPPFLAGS = \
 @COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src` \
-@COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp`
+@COIN_HAS_OSITESTS_TRUE@        -I`$(CYGPATH_W) $(srcdir)/../src/OsiClp` \
+@COIN_HAS_OSITESTS_TRUE@        $(COINUTILS_CFLAGS) $(OSI_CFLAGS) $(OSITESTS_CFLAGS)
 
 @COIN_HAS_OSITESTS_TRUE@testdepend = osiUnitTest$(EXEEXT)