Changeset 899

Timestamp:

Jan 5, 2008 7:42:42 PM (13 years ago)

Author:

andreasw

Message:

allow the Intel icl compiler in mcvs dos mode; put README etc files into share/doc/coin/ subdirectories

Location:

trunk

Files:

• Makemain.inc (modified) (2 diffs)
• coin.m4 (modified) (15 diffs)

trunk/Makemain.inc

@@ -1 @@
-# Copyright (C) 2006 International Business Machines and others.
+# Copyright (C) 2006, 2007 International Business Machines and others.
 # All Rights Reserved.
 # This file is distributed under the Common Public License.
@@ -12 +12 @@
 
 DocFiles =  README AUTHORS LICENSE
-DocInstallDir = $(prefix)/share/doc/$(PACKAGE_NAME)
+DocInstallDir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)
 
-install-doc:
+install-doc: $(DocFiles)
         test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
         for file in $(DocFiles); do \

trunk/coin.m4

@@ -457 +457 @@
                   [Under Cygwin, compile so that executables run under DOS.
                    Set to mingw to use gcc/g++/ld with -mno-cygwin.
-                   Set to msvc to use cl/link.
+                   Set to msvc to use cl/link (or icl/link).
                    Default when mentioned: mingw.
                    Default when not mentioned: disabled.])],
@@ -512 +512 @@
   *-cygwin* | *-mingw*)
              if test "$enable_doscompile" = msvc ; then
-               comps="cl"
+               comps="icl cl"
              else
                comps="g++ cl"
@@ -533 +533 @@
 # It seems that we need to cleanup something here for the Windows 
 case "$CXX" in
-  cl* | */cl* | CL* | */CL* )
+  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
     sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
     mv confdefs.hh confdefs.h
@@ -597 +597 @@
             coin_add_cxxflags='-nologo -EHsc -GR -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
             coin_dbg_cxxflags='-MTd'
+            ;;
+          icl* | */icl* | ICL* | */ICL*)
+            # The MT and MTd options are mutually exclusive
+            coin_opt_cxxflags='-MT -Ox'
+            coin_add_cxxflags='-nologo -EHsc -GR -D_CRT_SECURE_NO_DEPRECATE'
+            coin_dbg_cxxflags='-MTd -debug'
             ;;
         esac
@@ -863 +869 @@
 if test x"$CXX" != x; then
   case "$CXX" in
-    cl* | */cl* | CL* | */CL*)
+    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
       if test x"$CC" = x; then
         CC="$CXX"
@@ -889 +895 @@
   *-cygwin* | *-mingw*)
              if test "$enable_doscompile" = msvc ; then
-               comps="cl"
+               comps="icl cl"
              else
                comps="gcc cl"
@@ -965 +971 @@
             coin_add_cflags='-nologo -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
             coin_dbg_cflags='-MTd'
+            ;;
+          icl* | */icl* | ICL* | */ICL*)
+            coin_opt_cflags='-MT -Ox'
+            coin_add_cflags='-nologo -D_CRT_SECURE_NO_DEPRECATE'
+            coin_dbg_cflags='-MTd -debug'
             ;;
         esac
@@ -1090 +1101 @@
 # Correct ADDLIBS initialization if we are using the MS compiler
 case "$CC" in
-  cl* | */cl* | CL* | */CL*)
+  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
     ADDLIBS=
     AC_COIN_MINGW_LD_FIX
@@ -1798 +1809 @@
 AC_DEFUN([AC_COIN_PATCH_LIBTOOL_CYGWIN],
 [ case "$CXX" in
-    cl* | */cl* | CL* | */CL*) 
+    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 
       AC_MSG_NOTICE(Applying patches to libtool for cl compiler)
       sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
@@ -2032 +2043 @@
 fi
 case "$CC" in
-  cl* | */cl* | CL* | */CL*)
+  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
     coin_link_input_cmd=cp ;;
 esac
@@ -2062 +2073 @@
   AC_SUBST(LIBEXT)
   case "$CC" in
-    cl* | */cl* | CL* | */CL*)
+    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
          LIBEXT=lib ;;
       *) LIBEXT=a ;;
@@ -2377 +2388 @@
   fi
   case "$CC" in
-    cl* | */cl* | CL* | */CL*)
+    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
       lnkcmd=cp ;;
   esac
@@ -2622 +2633 @@
 # Determine the name of the ASL library
 case "$CC" in
-  cl* | */cl* | CL* | */CL*)
+  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
     ampllib=amplsolv.lib ;;
   *)
@@ -2838 +2849 @@
                          LIBS="$SAVE_LIBS"])
       ;;
+    *-cygwin* | *-mingw*)
 # On cygwin, consider -lblas only if doscompile is disabled. The prebuilt
 # library will want to link with cygwin, hence won't run standalone in DOS.
-    *-cygwin*)
       if test "$enable_doscompile" = mingw; then
         skip_lblas_check=yes
       fi
+      case "$CC" in
+        cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
+          SAVE_LIBS="$LIBS"
+          AC_MSG_CHECKING([for BLAS in MKL])
+          LIBS="mkl_intel_c.lib mkl_sequential.lib mkl_core.lib $LIBS"
+          AC_COIN_TRY_FLINK([daxpy],
+                            [AC_MSG_RESULT([yes])
+                             use_blas='mkl_intel_c.lib mkl_sequential.lib mkl_core.lib'
+                             ADDLIBS="mkl_intel_c.lib mkl_sequential.lib mkl_core.lib $ADDLIBS"],
+                            [AC_MSG_RESULT([no])
+                             LIBS="$SAVE_LIBS"])
+          ;;
+      esac
       ;;
   esac
@@ -3053 +3077 @@
 
   case "$CC" in
-    cl* | */cl* | CL* | */CL*)
+    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
          libe=lib ;;
       *) libe=a ;;