Changeset 1501 for trunk/Cbc/test


Ignore:
Timestamp:
Sep 13, 2010 3:41:21 AM (9 years ago)
Author:
stefan
Message:

change from COIN_HAS_MODULE to COIN_HAS_PACKAGE

Location:
trunk/Cbc/test
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/test/Makefile.am

    r1467 r1501  
    6060
    6161gamsTest_SOURCES = gamsTest.cpp
    62 gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(COINDEPEND_LIBS) $(ADDLIBS)
     62gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_LIBS)
    6363gamsTest_LDFLAGS = -rpath $(libdir)
    6464
     
    6767if COIN_HAS_CLP
    6868  AM_CPPFLAGS += $(CLP_CFLAGS)
    69   gamsTest_LDADD += $(CLP_LIBS)
     69#  gamsTest_LDADD += $(CLP_LIBS)
    7070endif
    7171
    7272if COIN_HAS_CPX
    7373  AM_CPPFLAGS += $(CPX_CFLAGS)
    74   gamsTest_LDADD += $(CPX_LIBS)
     74#  gamsTest_LDADD += $(CPX_LIBS)
    7575endif
    7676
    7777if COIN_HAS_DYLP
    7878  AM_CPPFLAGS += $(DYLP_CFLAGS)
    79   gamsTest_LDADD += $(DYLP_LIBS)
     79#  gamsTest_LDADD += $(DYLP_LIBS)
    8080endif
    8181
    8282if COIN_HAS_GLPK
    8383  AM_CPPFLAGS += $(GLPK_CFLAGS)
    84   gamsTest_LDADD += $(GLPK_LIBS)
     84#  gamsTest_LDADD += $(GLPK_LIBS)
    8585endif
    8686
    8787if COIN_HAS_MSK
    8888  AM_CPPFLAGS += $(MSK_CFLAGS)
    89   gamsTest_LDADD += $(MSK_LIBS)
     89#  gamsTest_LDADD += $(MSK_LIBS)
    9090endif
    9191
     
    9797if COIN_HAS_VOL
    9898  AM_CPPFLAGS += $(VOL_CFLAGS)
    99   gamsTest_LDADD += $(VOL_LIBS)
     99#  gamsTest_LDADD += $(VOL_LIBS)
    100100endif
    101101
    102102if COIN_HAS_XPR
    103103  AM_CPPFLAGS += $(XPR_CFLAGS)
    104   gamsTest_LDADD += $(XPR_LIBS)
    105 endif
    106 
    107 if COIN_HAS_ASL
    108   AM_CPPFLAGS += $(ASL_CFLAGS)
    109   gamsTest_LDADD += $(ASL_LIBS)
     104#  gamsTest_LDADD += $(XPR_LIBS)
    110105endif
    111106
     
    117112
    118113osiUnitTest_LDADD = ../src/OsiCbc/libOsiCbc.la ../src/libCbc.la \
    119     $(COINDEPEND_LIBS) $(OSITESTS_LIBS) $(ADDLIBS)
     114    $(CBCLIB_LIBS) $(OSITESTS_LIBS)
    120115
    121116AM_CPPFLAGS += $(OSITESTS_CFLAGS) \
  • trunk/Cbc/test/Makefile.in

    r1490 r1501  
    5151bin_PROGRAMS = gamsTest$(EXEEXT) osiUnitTest$(EXEEXT)
    5252@COIN_HAS_CLP_TRUE@am__append_7 = $(CLP_CFLAGS)
    53 @COIN_HAS_CLP_TRUE@am__append_8 = $(CLP_LIBS)
    54 @COIN_HAS_CPX_TRUE@am__append_9 = $(CPX_CFLAGS)
    55 @COIN_HAS_CPX_TRUE@am__append_10 = $(CPX_LIBS)
    56 @COIN_HAS_DYLP_TRUE@am__append_11 = $(DYLP_CFLAGS)
    57 @COIN_HAS_DYLP_TRUE@am__append_12 = $(DYLP_LIBS)
    58 @COIN_HAS_GLPK_TRUE@am__append_13 = $(GLPK_CFLAGS)
    59 @COIN_HAS_GLPK_TRUE@am__append_14 = $(GLPK_LIBS)
    60 @COIN_HAS_MSK_TRUE@am__append_15 = $(MSK_CFLAGS)
    61 @COIN_HAS_MSK_TRUE@am__append_16 = $(MSK_LIBS)
     53#  gamsTest_LDADD += $(CLP_LIBS)
     54@COIN_HAS_CPX_TRUE@am__append_8 = $(CPX_CFLAGS)
     55#  gamsTest_LDADD += $(CPX_LIBS)
     56@COIN_HAS_DYLP_TRUE@am__append_9 = $(DYLP_CFLAGS)
     57#  gamsTest_LDADD += $(DYLP_LIBS)
     58@COIN_HAS_GLPK_TRUE@am__append_10 = $(GLPK_CFLAGS)
     59#  gamsTest_LDADD += $(GLPK_LIBS)
     60@COIN_HAS_MSK_TRUE@am__append_11 = $(MSK_CFLAGS)
     61#  gamsTest_LDADD += $(MSK_LIBS)
    6262
    6363# if COIN_HAS_SPX
     
    6565#   gamsTest_LDADD += $(SPX_LIBS)
    6666# endif
    67 @COIN_HAS_VOL_TRUE@am__append_17 = $(VOL_CFLAGS)
    68 @COIN_HAS_VOL_TRUE@am__append_18 = $(VOL_LIBS)
    69 @COIN_HAS_XPR_TRUE@am__append_19 = $(XPR_CFLAGS)
    70 @COIN_HAS_XPR_TRUE@am__append_20 = $(XPR_LIBS)
    71 @COIN_HAS_ASL_TRUE@am__append_21 = $(ASL_CFLAGS)
    72 @COIN_HAS_ASL_TRUE@am__append_22 = $(ASL_LIBS)
     67@COIN_HAS_VOL_TRUE@am__append_12 = $(VOL_CFLAGS)
     68#  gamsTest_LDADD += $(VOL_LIBS)
     69@COIN_HAS_XPR_TRUE@am__append_13 = $(XPR_CFLAGS)
    7370subdir = test
    7471DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
     
    8784gamsTest_OBJECTS = $(am_gamsTest_OBJECTS)
    8885am__DEPENDENCIES_1 =
    89 @COIN_HAS_CLP_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
    90 @COIN_HAS_CPX_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
    91 @COIN_HAS_DYLP_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
    92 @COIN_HAS_GLPK_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
    93 @COIN_HAS_MSK_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
    94 @COIN_HAS_VOL_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
    95 @COIN_HAS_XPR_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
    96 @COIN_HAS_ASL_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1)
    9786gamsTest_DEPENDENCIES = ../src/libCbcSolver.la ../src/libCbc.la \
    98         $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
    99         $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
    100         $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \
    101         $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_7) \
    102         $(am__DEPENDENCIES_8) $(am__DEPENDENCIES_9)
     87        $(am__DEPENDENCIES_1)
    10388am_osiUnitTest_OBJECTS = osiUnitTest.$(OBJEXT) \
    10489        OsiCbcSolverInterfaceTest.$(OBJEXT)
    10590osiUnitTest_OBJECTS = $(am_osiUnitTest_OBJECTS)
    10691osiUnitTest_DEPENDENCIES = ../src/OsiCbc/libOsiCbc.la ../src/libCbc.la \
    107         $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
    108         $(am__DEPENDENCIES_1)
     92        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
    10993DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
    11094depcomp = $(SHELL) $(top_srcdir)/depcomp
     
    143127AWK = @AWK@
    144128BUILDTOOLSDIR = @BUILDTOOLSDIR@
     129CBCGENERIC_LIBS = @CBCGENERIC_LIBS@
     130CBCGENERIC_PCLIBS = @CBCGENERIC_PCLIBS@
     131CBCGENERIC_PCREQUIRES = @CBCGENERIC_PCREQUIRES@
     132CBCLIB_LIBS = @CBCLIB_LIBS@
     133CBCLIB_PCLIBS = @CBCLIB_PCLIBS@
     134CBCLIB_PCREQUIRES = @CBCLIB_PCREQUIRES@
    145135CBC_BUILD_CBC_GENERIC_FALSE = @CBC_BUILD_CBC_GENERIC_FALSE@
    146136CBC_BUILD_CBC_GENERIC_TRUE = @CBC_BUILD_CBC_GENERIC_TRUE@
     
    289279PKG_CONFIG = @PKG_CONFIG@
    290280RANLIB = @RANLIB@
    291 REQUIREDPACKAGES = @REQUIREDPACKAGES@
    292281RPATH_FLAGS = @RPATH_FLAGS@
    293282SAMPLE_CFLAGS = @SAMPLE_CFLAGS@
     
    378367ositestsflags = $(am__append_4) $(am__append_6)
    379368gamsTest_SOURCES = gamsTest.cpp
    380 gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la \
    381         $(COINDEPEND_LIBS) $(ADDLIBS) $(am__append_8) $(am__append_10) \
    382         $(am__append_12) $(am__append_14) $(am__append_16) \
    383         $(am__append_18) $(am__append_20) $(am__append_22)
     369gamsTest_LDADD = ../src/libCbcSolver.la ../src/libCbc.la $(CBCLIB_LIBS)
    384370gamsTest_LDFLAGS = -rpath $(libdir)
    385371AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/../src` $(COINDEPEND_CFLAGS) \
    386         $(am__append_7) $(am__append_9) $(am__append_11) \
    387         $(am__append_13) $(am__append_15) $(am__append_17) \
    388         $(am__append_19) $(am__append_21) $(OSITESTS_CFLAGS) \
    389         -I`$(CYGPATH_W) $(srcdir)/../src/OsiCbc`
     372        $(am__append_7) $(am__append_8) $(am__append_9) \
     373        $(am__append_10) $(am__append_11) $(am__append_12) \
     374        $(am__append_13) $(OSITESTS_CFLAGS) -I`$(CYGPATH_W) \
     375        $(srcdir)/../src/OsiCbc`
     376#  gamsTest_LDADD += $(XPR_LIBS)
    390377
    391378########################################################################
     
    394381osiUnitTest_SOURCES = osiUnitTest.cpp OsiCbcSolverInterfaceTest.cpp
    395382osiUnitTest_LDADD = ../src/OsiCbc/libOsiCbc.la ../src/libCbc.la \
    396     $(COINDEPEND_LIBS) $(OSITESTS_LIBS) $(ADDLIBS)
     383    $(CBCLIB_LIBS) $(OSITESTS_LIBS)
    397384
    398385
Note: See TracChangeset for help on using the changeset viewer.