Changeset 431


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

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

Location:
trunk/CoinMP
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/CoinMP/Makefile.am

    r428 r431  
    6969else
    7070if COIN_CXX_IS_CL
    71         echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCoinMP.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/coin_addlibs_cpp.txt
     71        echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCoinMP.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/coin_addlibs.txt
    7272else
    7373        echo -L@abs_lib_dir@ -lCoinMP @COINMP_LIBS_INSTALLED@ > $(addlibsdir)/coinmp_addlibs.txt
  • trunk/CoinMP/Makefile.in

    r430 r431  
    792792@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    793793@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs coinmp > $(addlibsdir)/coinmp_addlibs.txt
    794 @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCoinMP.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/coin_addlibs_cpp.txt
     794@COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCoinMP.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/coin_addlibs.txt
    795795@COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lCoinMP @COINMP_LIBS_INSTALLED@ > $(addlibsdir)/coinmp_addlibs.txt
    796796
  • trunk/CoinMP/configure

    r428 r431  
    2120721207     # construct dependencies variables from LIBS variables
    2120821208     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    21209      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     21209     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2121021210     # then remove everything of the form -xxx
    2121121211     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    21212      CBC_DEPENDENCIES=`echo " $CBC_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    21213 
    21214        COINMP_DEPENDENCIES=`echo " $COINMP_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21212     CBC_DEPENDENCIES=`echo " $CBC_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21213
     21214       COINMP_DEPENDENCIES=`echo " $COINMP_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2121521215
    2121621216  fi
Note: See TracChangeset for help on using the changeset viewer.