Changeset 1739


Ignore:
Timestamp:
Oct 13, 2011 4:36:06 PM (8 years ago)
Author:
stefan
Message:

fix name of addlibs file when using cl/icl compiler; rerun autotools

Location:
trunk/Cbc
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/Makefile.am

    r1714 r1739  
    138138else
    139139if COIN_CXX_IS_CL
    140         echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs_cpp.txt
     140        echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs.txt
    141141else
    142142        echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
  • trunk/Cbc/Makefile.in

    r1714 r1739  
    979979@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    980980@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.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.txt
    982982@COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
    983983
  • trunk/Cbc/configure

    r1720 r1739  
    2128121281     # construct dependencies variables from LIBS variables
    2128221282     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    21283      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     21283     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2128421284     # then remove everything of the form -xxx
    2128521285     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    21286      COINDEPEND_DEPENDENCIES=`echo " $COINDEPEND_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    21287 
    21288        CBCLIB_DEPENDENCIES=`echo " $CBCLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    21289 
    21290        CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21286     COINDEPEND_DEPENDENCIES=`echo " $COINDEPEND_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21287
     21288       CBCLIB_DEPENDENCIES=`echo " $CBCLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21289
     21290       CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2129121291
    2129221292  fi
     
    2183021830     # construct dependencies variables from LIBS variables
    2183121831     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    21832      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     21832     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2183321833     # then remove everything of the form -xxx
    2183421834     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    21835      CLP_DEPENDENCIES=`echo " $CLP_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    21836 
    21837        CBCLIB_DEPENDENCIES=`echo " $CBCLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    21838 
    21839        CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21835     CLP_DEPENDENCIES=`echo " $CLP_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21836
     21837       CBCLIB_DEPENDENCIES=`echo " $CBCLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21838
     21839       CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2184021840
    2184121841  fi
     
    2233722337     # construct dependencies variables from LIBS variables
    2233822338     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    22339      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     22339     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2234022340     # then remove everything of the form -xxx
    2234122341     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    22342      OSITESTS_DEPENDENCIES=`echo " $OSITESTS_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     22342     OSITESTS_DEPENDENCIES=`echo " $OSITESTS_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2234322343
    2234422344  fi
     
    2281822818     # construct dependencies variables from LIBS variables
    2281922819     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    22820      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     22820     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2282122821     # then remove everything of the form -xxx
    2282222822     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    22823      SAMPLE_DEPENDENCIES=`echo " $SAMPLE_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     22823     SAMPLE_DEPENDENCIES=`echo " $SAMPLE_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2282422824
    2282522825  fi
     
    2329923299     # construct dependencies variables from LIBS variables
    2330023300     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    23301      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     23301     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2330223302     # then remove everything of the form -xxx
    2330323303     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    23304      NETLIB_DEPENDENCIES=`echo " $NETLIB_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     23304     NETLIB_DEPENDENCIES=`echo " $NETLIB_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2330523305
    2330623306  fi
     
    2378023780     # construct dependencies variables from LIBS variables
    2378123781     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    23782      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     23782     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2378323783     # then remove everything of the form -xxx
    2378423784     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    23785      MIPLIB3_DEPENDENCIES=`echo " $MIPLIB3_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     23785     MIPLIB3_DEPENDENCIES=`echo " $MIPLIB3_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2378623786
    2378723787  fi
     
    2559425594     # construct dependencies variables from LIBS variables
    2559525595     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    25596      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     25596     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2559725597     # then remove everything of the form -xxx
    2559825598     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    25599      DYLP_DEPENDENCIES=`echo " $DYLP_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    25600 
    25601        CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     25599     DYLP_DEPENDENCIES=`echo " $DYLP_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     25600
     25601       CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2560225602
    2560325603  fi
     
    2608426084     # construct dependencies variables from LIBS variables
    2608526085     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    26086      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     26086     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2608726087     # then remove everything of the form -xxx
    2608826088     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    26089      VOL_DEPENDENCIES=`echo " $VOL_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     26089     VOL_DEPENDENCIES=`echo " $VOL_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2609026090
    2609126091  fi
     
    2660726607     # construct dependencies variables from LIBS variables
    2660826608     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    26609      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     26609     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2661026610     # then remove everything of the form -xxx
    2661126611     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    26612      CPX_DEPENDENCIES=`echo " $CPX_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    26613 
    26614        CBCLIB_DEPENDENCIES=`echo " $CBCLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    26615 
    26616        CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     26612     CPX_DEPENDENCIES=`echo " $CPX_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     26613
     26614       CBCLIB_DEPENDENCIES=`echo " $CBCLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     26615
     26616       CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2661726617
    2661826618  fi
     
    2712727127     # construct dependencies variables from LIBS variables
    2712827128     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    27129      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     27129     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2713027130     # then remove everything of the form -xxx
    2713127131     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    27132      GLPK_DEPENDENCIES=`echo " $GLPK_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    27133 
    27134        CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     27132     GLPK_DEPENDENCIES=`echo " $GLPK_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     27133
     27134       CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2713527135
    2713627136  fi
     
    2761727617     # construct dependencies variables from LIBS variables
    2761827618     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    27619      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     27619     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2762027620     # then remove everything of the form -xxx
    2762127621     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    27622      GRB_DEPENDENCIES=`echo " $GRB_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     27622     GRB_DEPENDENCIES=`echo " $GRB_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2762327623
    2762427624  fi
     
    2811928119     # construct dependencies variables from LIBS variables
    2812028120     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    28121      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     28121     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2812228122     # then remove everything of the form -xxx
    2812328123     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    28124      MSK_DEPENDENCIES=`echo " $MSK_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    28125 
    28126        CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     28124     MSK_DEPENDENCIES=`echo " $MSK_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     28125
     28126       CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2812728127
    2812828128  fi
     
    2863028630     # construct dependencies variables from LIBS variables
    2863128631     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    28632      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     28632     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2863328633     # then remove everything of the form -xxx
    2863428634     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    28635      SPX_DEPENDENCIES=`echo " $SPX_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    28636 
    28637        CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     28635     SPX_DEPENDENCIES=`echo " $SPX_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     28636
     28637       CBCGENERIC_DEPENDENCIES=`echo " $CBCGENERIC_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2863828638
    2863928639  fi
     
    2912029120     # construct dependencies variables from LIBS variables
    2912129121     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    29122      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     29122     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2912329123     # then remove everything of the form -xxx
    2912429124     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    29125      XPR_DEPENDENCIES=`echo " $XPR_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     29125     XPR_DEPENDENCIES=`echo " $XPR_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2912629126
    2912729127  fi
     
    2960729607     # construct dependencies variables from LIBS variables
    2960829608     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    29609      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     29609     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2961029610     # then remove everything of the form -xxx
    2961129611     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    29612      ASL_DEPENDENCIES=`echo " $ASL_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     29612     ASL_DEPENDENCIES=`echo " $ASL_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2961329613
    2961429614  fi
Note: See TracChangeset for help on using the changeset viewer.