Changeset 1803


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

fix name of addlibs file in cl build; rerun autotools

Location:
trunk/Clp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/Makefile.am

    r1781 r1803  
    124124else
    125125if COIN_CXX_IS_CL
    126         echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs_cpp.txt
     126        echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs.txt
    127127else
    128128        echo -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/clp_addlibs.txt
  • trunk/Clp/Makefile.in

    r1781 r1803  
    904904@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    905905@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.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.txt
    907907@COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/clp_addlibs.txt
    908908
  • trunk/Clp/configure

    r1788 r1803  
    2126121261     # construct dependencies variables from LIBS variables
    2126221262     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    21263      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     21263     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2126421264     # then remove everything of the form -xxx
    2126521265     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    21266      COINUTILS_DEPENDENCIES=`echo " $COINUTILS_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    21267 
    21268        CLPLIB_DEPENDENCIES=`echo " $CLPLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21266     COINUTILS_DEPENDENCIES=`echo " $COINUTILS_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21267
     21268       CLPLIB_DEPENDENCIES=`echo " $CLPLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2126921269
    2127021270  fi
     
    2177721777     # construct dependencies variables from LIBS variables
    2177821778     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    21779      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     21779     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2178021780     # then remove everything of the form -xxx
    2178121781     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    21782      OSI_DEPENDENCIES=`echo " $OSI_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    21783 
    21784        OSICLPLIB_DEPENDENCIES=`echo " $OSICLPLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21782     OSI_DEPENDENCIES=`echo " $OSI_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21783
     21784       OSICLPLIB_DEPENDENCIES=`echo " $OSICLPLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2178521785
    2178621786  fi
     
    2226722267     # construct dependencies variables from LIBS variables
    2226822268     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    22269      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     22269     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2227022270     # then remove everything of the form -xxx
    2227122271     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    22272      OSITESTS_DEPENDENCIES=`echo " $OSITESTS_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     22272     OSITESTS_DEPENDENCIES=`echo " $OSITESTS_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2227322273
    2227422274  fi
     
    2274822748     # construct dependencies variables from LIBS variables
    2274922749     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    22750      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     22750     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2275122751     # then remove everything of the form -xxx
    2275222752     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    22753      SAMPLE_DEPENDENCIES=`echo " $SAMPLE_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     22753     SAMPLE_DEPENDENCIES=`echo " $SAMPLE_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2275422754
    2275522755  fi
     
    2322923229     # construct dependencies variables from LIBS variables
    2323023230     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    23231      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     23231     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2323223232     # then remove everything of the form -xxx
    2323323233     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    23234      NETLIB_DEPENDENCIES=`echo " $NETLIB_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     23234     NETLIB_DEPENDENCIES=`echo " $NETLIB_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2323523235
    2323623236  fi
     
    2412124121     # construct dependencies variables from LIBS variables
    2412224122     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    24123      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     24123     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2412424124     # then remove everything of the form -xxx
    2412524125     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    24126      GLPK_DEPENDENCIES=`echo " $GLPK_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    24127 
    24128        CLPLIB_DEPENDENCIES=`echo " $CLPLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     24126     GLPK_DEPENDENCIES=`echo " $GLPK_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     24127
     24128       CLPLIB_DEPENDENCIES=`echo " $CLPLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2412924129
    2413024130  fi
     
    2465624656     # construct dependencies variables from LIBS variables
    2465724657     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    24658      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     24658     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2465924659     # then remove everything of the form -xxx
    2466024660     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    24661      MUMPS_DEPENDENCIES=`echo " $MUMPS_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    24662 
    24663        CLPLIB_DEPENDENCIES=`echo " $CLPLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     24661     MUMPS_DEPENDENCIES=`echo " $MUMPS_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     24662
     24663       CLPLIB_DEPENDENCIES=`echo " $CLPLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2466424664
    2466524665  fi
     
    2961429614     # construct dependencies variables from LIBS variables
    2961529615     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    29616      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     29616     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2961729617     # then remove everything of the form -xxx
    2961829618     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    29619      BLAS_DEPENDENCIES=`echo " $BLAS_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    29620 
    29621        CLPLIB_DEPENDENCIES=`echo " $CLPLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     29619     BLAS_DEPENDENCIES=`echo " $BLAS_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     29620
     29621       CLPLIB_DEPENDENCIES=`echo " $CLPLIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2962229622
    2962329623  fi
Note: See TracChangeset for help on using the changeset viewer.