Changeset 1871 for ThirdParty/ASL/trunk


Ignore:
Timestamp:
Nov 25, 2010 4:59:10 PM (9 years ago)
Author:
stefan
Message:

rename ampl solver library to have standard format, and to be the same for MS and other compilers

Location:
ThirdParty/ASL/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • ThirdParty/ASL/trunk/coinasl-uninstalled.pc.in

    r1678 r1871  
    55Description: AMPL Solver Library
    66Version: @PACKAGE_VERSION@
    7 Libs: @ABSPATH_AMPLSOLVER_UNINSTALLED@ @ASL_PCLIBS@
     7Libs: -L${libdir} -lamplsolver @ASL_PCLIBS@
    88Cflags: -I@ABSBUILDDIR@ -I@abs_source_dir@/solvers

  • ThirdParty/ASL/trunk/coinasl.pc.in

    r1678 r1871  
    77Description: AMPL Solver Library
    88Version: @PACKAGE_VERSION@
    9 Libs: @ABSPATH_AMPLSOLVER_INSTALLED@ @ASL_PCLIBS@
     9Libs: -L${libdir} -lamplsolver @ASL_PCLIBS@
    1010Cflags: -I${includedir}

  • ThirdParty/ASL/trunk/compile_Unix_ASL.in

    r1269 r1871  
    9191# configure has already put the appropriate information into ASLMAKEFLAGS.
    9292
     93libampl=@AMPLSOLVER_A@
    9394make -f makefile.coin @ASLMAKEFLAGS@ CC="@CC@"
    9495mv amplsolver.a ../$libampl

  • ThirdParty/ASL/trunk/configure

    r1731 r1871  
    2009720097case "$CC" in
    2009820098  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    20099     AMPLSOLVER_A=amplsolv.lib
     20099    AMPLSOLVER_A=libamplsolv.lib
    2010020100    msvc_compile=yes
    2010120101    ;;
    2010220102  *)
    20103     AMPLSOLVER_A=amplsolver.a
     20103    AMPLSOLVER_A=libamplsolver.a
    2010420104    msvc_compile=no
    2010520105    ;;

  • ThirdParty/ASL/trunk/configure.ac

    r1726 r1871  
    7272case "$CC" in
    7373  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    74     AMPLSOLVER_A=amplsolv.lib
     74    AMPLSOLVER_A=libamplsolver.lib
    7575    msvc_compile=yes
    7676    ;;
    7777  *)
    78     AMPLSOLVER_A=amplsolver.a
     78    AMPLSOLVER_A=libamplsolver.a
    7979    msvc_compile=no
    8080    ;;
Note: See TracChangeset for help on using the changeset viewer.