Changeset 899
- Timestamp:
- Jan 5, 2008 7:42:42 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makemain.inc
r863 r899 1 # Copyright (C) 2006 International Business Machines and others.1 # Copyright (C) 2006, 2007 International Business Machines and others. 2 2 # All Rights Reserved. 3 3 # This file is distributed under the Common Public License. … … 12 12 13 13 DocFiles = README AUTHORS LICENSE 14 DocInstallDir = $(prefix)/share/doc/ $(PACKAGE_NAME)14 DocInstallDir = $(prefix)/share/doc/coin/$(PACKAGE_NAME) 15 15 16 install-doc: 16 install-doc: $(DocFiles) 17 17 test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)" 18 18 for file in $(DocFiles); do \ -
trunk/coin.m4
r777 r899 457 457 [Under Cygwin, compile so that executables run under DOS. 458 458 Set to mingw to use gcc/g++/ld with -mno-cygwin. 459 Set to msvc to use cl/link .459 Set to msvc to use cl/link (or icl/link). 460 460 Default when mentioned: mingw. 461 461 Default when not mentioned: disabled.])], … … 512 512 *-cygwin* | *-mingw*) 513 513 if test "$enable_doscompile" = msvc ; then 514 comps=" cl"514 comps="icl cl" 515 515 else 516 516 comps="g++ cl" … … 533 533 # It seems that we need to cleanup something here for the Windows 534 534 case "$CXX" in 535 cl* | */cl* | CL* | */CL* )535 cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 536 536 sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh 537 537 mv confdefs.hh confdefs.h … … 597 597 coin_add_cxxflags='-nologo -EHsc -GR -wd4996 -D_CRT_SECURE_NO_DEPRECATE' 598 598 coin_dbg_cxxflags='-MTd' 599 ;; 600 icl* | */icl* | ICL* | */ICL*) 601 # The MT and MTd options are mutually exclusive 602 coin_opt_cxxflags='-MT -Ox' 603 coin_add_cxxflags='-nologo -EHsc -GR -D_CRT_SECURE_NO_DEPRECATE' 604 coin_dbg_cxxflags='-MTd -debug' 599 605 ;; 600 606 esac … … 863 869 if test x"$CXX" != x; then 864 870 case "$CXX" in 865 cl* | */cl* | CL* | */CL* )871 cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 866 872 if test x"$CC" = x; then 867 873 CC="$CXX" … … 889 895 *-cygwin* | *-mingw*) 890 896 if test "$enable_doscompile" = msvc ; then 891 comps=" cl"897 comps="icl cl" 892 898 else 893 899 comps="gcc cl" … … 965 971 coin_add_cflags='-nologo -wd4996 -D_CRT_SECURE_NO_DEPRECATE' 966 972 coin_dbg_cflags='-MTd' 973 ;; 974 icl* | */icl* | ICL* | */ICL*) 975 coin_opt_cflags='-MT -Ox' 976 coin_add_cflags='-nologo -D_CRT_SECURE_NO_DEPRECATE' 977 coin_dbg_cflags='-MTd -debug' 967 978 ;; 968 979 esac … … 1090 1101 # Correct ADDLIBS initialization if we are using the MS compiler 1091 1102 case "$CC" in 1092 cl* | */cl* | CL* | */CL* )1103 cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 1093 1104 ADDLIBS= 1094 1105 AC_COIN_MINGW_LD_FIX … … 1798 1809 AC_DEFUN([AC_COIN_PATCH_LIBTOOL_CYGWIN], 1799 1810 [ case "$CXX" in 1800 cl* | */cl* | CL* | */CL* )1811 cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 1801 1812 AC_MSG_NOTICE(Applying patches to libtool for cl compiler) 1802 1813 sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \ … … 2032 2043 fi 2033 2044 case "$CC" in 2034 cl* | */cl* | CL* | */CL* )2045 cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 2035 2046 coin_link_input_cmd=cp ;; 2036 2047 esac … … 2062 2073 AC_SUBST(LIBEXT) 2063 2074 case "$CC" in 2064 cl* | */cl* | CL* | */CL* )2075 cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 2065 2076 LIBEXT=lib ;; 2066 2077 *) LIBEXT=a ;; … … 2377 2388 fi 2378 2389 case "$CC" in 2379 cl* | */cl* | CL* | */CL* )2390 cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 2380 2391 lnkcmd=cp ;; 2381 2392 esac … … 2622 2633 # Determine the name of the ASL library 2623 2634 case "$CC" in 2624 cl* | */cl* | CL* | */CL* )2635 cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 2625 2636 ampllib=amplsolv.lib ;; 2626 2637 *) … … 2838 2849 LIBS="$SAVE_LIBS"]) 2839 2850 ;; 2851 *-cygwin* | *-mingw*) 2840 2852 # On cygwin, consider -lblas only if doscompile is disabled. The prebuilt 2841 2853 # library will want to link with cygwin, hence won't run standalone in DOS. 2842 *-cygwin*)2843 2854 if test "$enable_doscompile" = mingw; then 2844 2855 skip_lblas_check=yes 2845 2856 fi 2857 case "$CC" in 2858 cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 2859 SAVE_LIBS="$LIBS" 2860 AC_MSG_CHECKING([for BLAS in MKL]) 2861 LIBS="mkl_intel_c.lib mkl_sequential.lib mkl_core.lib $LIBS" 2862 AC_COIN_TRY_FLINK([daxpy], 2863 [AC_MSG_RESULT([yes]) 2864 use_blas='mkl_intel_c.lib mkl_sequential.lib mkl_core.lib' 2865 ADDLIBS="mkl_intel_c.lib mkl_sequential.lib mkl_core.lib $ADDLIBS"], 2866 [AC_MSG_RESULT([no]) 2867 LIBS="$SAVE_LIBS"]) 2868 ;; 2869 esac 2846 2870 ;; 2847 2871 esac … … 3053 3077 3054 3078 case "$CC" in 3055 cl* | */cl* | CL* | */CL* )3079 cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 3056 3080 libe=lib ;; 3057 3081 *) libe=a ;;
Note: See TracChangeset
for help on using the changeset viewer.