Changeset 4008


Ignore:
Timestamp:
Sep 12, 2019 9:21:28 AM (4 weeks ago)
Author:
stefan
Message:

use win32-dll, as we can define MUMPS_CALL to do a proper dllex/import

Location:
ThirdParty/Mumps/branches/mumps5
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/branches/mumps5/Makefile.in

    r4005 r4008  
    352352AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
    353353AR = @AR@
     354AS = @AS@
    354355AUTOCONF = @AUTOCONF@
    355356AUTOHEADER = @AUTOHEADER@
     
    401402MUMPS_CFLAGS = @MUMPS_CFLAGS@
    402403MUMPS_CFLAGS_NOPC = @MUMPS_CFLAGS_NOPC@
     404MUMPS_EXPORT = @MUMPS_EXPORT@
    403405MUMPS_LFLAGS = @MUMPS_LFLAGS@
    404406MUMPS_LFLAGS_NOPC = @MUMPS_LFLAGS_NOPC@
  • ThirdParty/Mumps/branches/mumps5/coinmumps.pc.in

    r3989 r4008  
    1010Libs: -L${libdir} -lcoinmumps
    1111Libs.private: @MUMPS_LFLAGS_NOPC@
    12 Cflags: -I${includedir} -DCOIN_USE_MUMPS_MPI_H
     12Cflags: -I${includedir} -DCOIN_USE_MUMPS_MPI_H -DMUMPS_CALL=@MUMPS_EXPORT@
    1313Requires.private: @MUMPS_PCFILES@
  • ThirdParty/Mumps/branches/mumps5/configure

    r4007 r4008  
    644644LTLIBOBJS
    645645LIBOBJS
     646MUMPS_EXPORT
    646647MUMPS_CFLAGS_NOPC
    647648MUMPS_LFLAGS_NOPC
     
    673674ac_ct_AR
    674675AR
    675 DLLTOOL
    676 OBJDUMP
    677676LN_S
    678677NM
     
    685684SED
    686685LIBTOOL
     686OBJDUMP
     687DLLTOOL
     688AS
    687689ac_ct_FC
    688690FCFLAGS
     
    56745676
    56755677
    5676 
    5677 
    5678 
    56795678{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
    56805679$as_echo_n "checking how to recognize dependent libraries... " >&6; }
     
    60126011
    60136012test -z "$DLLTOOL" && DLLTOOL=dlltool
    6014 
    6015 
    6016 
    60176013
    60186014
     
    83358331
    83368332
     8333enable_win32_dll=yes
     8334
     8335case $host in
     8336*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
     8337  if test -n "$ac_tool_prefix"; then
     8338  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
     8339set dummy ${ac_tool_prefix}as; ac_word=$2
     8340{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8341$as_echo_n "checking for $ac_word... " >&6; }
     8342if ${ac_cv_prog_AS+:} false; then :
     8343  $as_echo_n "(cached) " >&6
     8344else
     8345  if test -n "$AS"; then
     8346  ac_cv_prog_AS="$AS" # Let the user override the test.
     8347else
     8348as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8349for as_dir in $PATH
     8350do
     8351  IFS=$as_save_IFS
     8352  test -z "$as_dir" && as_dir=.
     8353    for ac_exec_ext in '' $ac_executable_extensions; do
     8354  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8355    ac_cv_prog_AS="${ac_tool_prefix}as"
     8356    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8357    break 2
     8358  fi
     8359done
     8360  done
     8361IFS=$as_save_IFS
     8362
     8363fi
     8364fi
     8365AS=$ac_cv_prog_AS
     8366if test -n "$AS"; then
     8367  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
     8368$as_echo "$AS" >&6; }
     8369else
     8370  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8371$as_echo "no" >&6; }
     8372fi
     8373
     8374
     8375fi
     8376if test -z "$ac_cv_prog_AS"; then
     8377  ac_ct_AS=$AS
     8378  # Extract the first word of "as", so it can be a program name with args.
     8379set dummy as; ac_word=$2
     8380{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8381$as_echo_n "checking for $ac_word... " >&6; }
     8382if ${ac_cv_prog_ac_ct_AS+:} false; then :
     8383  $as_echo_n "(cached) " >&6
     8384else
     8385  if test -n "$ac_ct_AS"; then
     8386  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
     8387else
     8388as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8389for as_dir in $PATH
     8390do
     8391  IFS=$as_save_IFS
     8392  test -z "$as_dir" && as_dir=.
     8393    for ac_exec_ext in '' $ac_executable_extensions; do
     8394  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8395    ac_cv_prog_ac_ct_AS="as"
     8396    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8397    break 2
     8398  fi
     8399done
     8400  done
     8401IFS=$as_save_IFS
     8402
     8403fi
     8404fi
     8405ac_ct_AS=$ac_cv_prog_ac_ct_AS
     8406if test -n "$ac_ct_AS"; then
     8407  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
     8408$as_echo "$ac_ct_AS" >&6; }
     8409else
     8410  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8411$as_echo "no" >&6; }
     8412fi
     8413
     8414  if test "x$ac_ct_AS" = x; then
     8415    AS="false"
     8416  else
     8417    case $cross_compiling:$ac_tool_warned in
     8418yes:)
     8419{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     8420$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     8421ac_tool_warned=yes ;;
     8422esac
     8423    AS=$ac_ct_AS
     8424  fi
     8425else
     8426  AS="$ac_cv_prog_AS"
     8427fi
     8428
     8429  if test -n "$ac_tool_prefix"; then
     8430  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
     8431set dummy ${ac_tool_prefix}dlltool; ac_word=$2
     8432{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8433$as_echo_n "checking for $ac_word... " >&6; }
     8434if ${ac_cv_prog_DLLTOOL+:} false; then :
     8435  $as_echo_n "(cached) " >&6
     8436else
     8437  if test -n "$DLLTOOL"; then
     8438  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
     8439else
     8440as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8441for as_dir in $PATH
     8442do
     8443  IFS=$as_save_IFS
     8444  test -z "$as_dir" && as_dir=.
     8445    for ac_exec_ext in '' $ac_executable_extensions; do
     8446  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8447    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     8448    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8449    break 2
     8450  fi
     8451done
     8452  done
     8453IFS=$as_save_IFS
     8454
     8455fi
     8456fi
     8457DLLTOOL=$ac_cv_prog_DLLTOOL
     8458if test -n "$DLLTOOL"; then
     8459  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
     8460$as_echo "$DLLTOOL" >&6; }
     8461else
     8462  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8463$as_echo "no" >&6; }
     8464fi
     8465
     8466
     8467fi
     8468if test -z "$ac_cv_prog_DLLTOOL"; then
     8469  ac_ct_DLLTOOL=$DLLTOOL
     8470  # Extract the first word of "dlltool", so it can be a program name with args.
     8471set dummy dlltool; ac_word=$2
     8472{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8473$as_echo_n "checking for $ac_word... " >&6; }
     8474if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
     8475  $as_echo_n "(cached) " >&6
     8476else
     8477  if test -n "$ac_ct_DLLTOOL"; then
     8478  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
     8479else
     8480as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8481for as_dir in $PATH
     8482do
     8483  IFS=$as_save_IFS
     8484  test -z "$as_dir" && as_dir=.
     8485    for ac_exec_ext in '' $ac_executable_extensions; do
     8486  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8487    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     8488    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8489    break 2
     8490  fi
     8491done
     8492  done
     8493IFS=$as_save_IFS
     8494
     8495fi
     8496fi
     8497ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
     8498if test -n "$ac_ct_DLLTOOL"; then
     8499  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
     8500$as_echo "$ac_ct_DLLTOOL" >&6; }
     8501else
     8502  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8503$as_echo "no" >&6; }
     8504fi
     8505
     8506  if test "x$ac_ct_DLLTOOL" = x; then
     8507    DLLTOOL="false"
     8508  else
     8509    case $cross_compiling:$ac_tool_warned in
     8510yes:)
     8511{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     8512$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     8513ac_tool_warned=yes ;;
     8514esac
     8515    DLLTOOL=$ac_ct_DLLTOOL
     8516  fi
     8517else
     8518  DLLTOOL="$ac_cv_prog_DLLTOOL"
     8519fi
     8520
     8521  if test -n "$ac_tool_prefix"; then
     8522  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
     8523set dummy ${ac_tool_prefix}objdump; ac_word=$2
     8524{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8525$as_echo_n "checking for $ac_word... " >&6; }
     8526if ${ac_cv_prog_OBJDUMP+:} false; then :
     8527  $as_echo_n "(cached) " >&6
     8528else
     8529  if test -n "$OBJDUMP"; then
     8530  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
     8531else
     8532as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8533for as_dir in $PATH
     8534do
     8535  IFS=$as_save_IFS
     8536  test -z "$as_dir" && as_dir=.
     8537    for ac_exec_ext in '' $ac_executable_extensions; do
     8538  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8539    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     8540    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8541    break 2
     8542  fi
     8543done
     8544  done
     8545IFS=$as_save_IFS
     8546
     8547fi
     8548fi
     8549OBJDUMP=$ac_cv_prog_OBJDUMP
     8550if test -n "$OBJDUMP"; then
     8551  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
     8552$as_echo "$OBJDUMP" >&6; }
     8553else
     8554  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8555$as_echo "no" >&6; }
     8556fi
     8557
     8558
     8559fi
     8560if test -z "$ac_cv_prog_OBJDUMP"; then
     8561  ac_ct_OBJDUMP=$OBJDUMP
     8562  # Extract the first word of "objdump", so it can be a program name with args.
     8563set dummy objdump; ac_word=$2
     8564{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     8565$as_echo_n "checking for $ac_word... " >&6; }
     8566if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
     8567  $as_echo_n "(cached) " >&6
     8568else
     8569  if test -n "$ac_ct_OBJDUMP"; then
     8570  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
     8571else
     8572as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     8573for as_dir in $PATH
     8574do
     8575  IFS=$as_save_IFS
     8576  test -z "$as_dir" && as_dir=.
     8577    for ac_exec_ext in '' $ac_executable_extensions; do
     8578  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     8579    ac_cv_prog_ac_ct_OBJDUMP="objdump"
     8580    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     8581    break 2
     8582  fi
     8583done
     8584  done
     8585IFS=$as_save_IFS
     8586
     8587fi
     8588fi
     8589ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
     8590if test -n "$ac_ct_OBJDUMP"; then
     8591  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
     8592$as_echo "$ac_ct_OBJDUMP" >&6; }
     8593else
     8594  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     8595$as_echo "no" >&6; }
     8596fi
     8597
     8598  if test "x$ac_ct_OBJDUMP" = x; then
     8599    OBJDUMP="false"
     8600  else
     8601    case $cross_compiling:$ac_tool_warned in
     8602yes:)
     8603{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     8604$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     8605ac_tool_warned=yes ;;
     8606esac
     8607    OBJDUMP=$ac_ct_OBJDUMP
     8608  fi
     8609else
     8610  OBJDUMP="$ac_cv_prog_OBJDUMP"
     8611fi
     8612
     8613  ;;
     8614esac
     8615
     8616test -z "$AS" && AS=as
     8617
     8618
     8619
     8620
     8621
     8622test -z "$DLLTOOL" && DLLTOOL=dlltool
     8623
     8624
     8625
     8626
     8627
     8628test -z "$OBJDUMP" && OBJDUMP=objdump
     8629
     8630
     8631
     8632
    83378633
    83388634
     
    83408636        enable_dlopen=no
    83418637
    8342 
    8343   enable_win32_dll=no
    83448638
    83458639
     
    1811218406
    1811318407
    18114 { $as_echo "$as_me:${as_lineno-$LINENO}: additional C preprocessor flags: $MY_DEFS" >&5
    18115 $as_echo "$as_me: additional C preprocessor flags: $MY_DEFS" >&6;}
    18116 { $as_echo "$as_me:${as_lineno-$LINENO}: additional Fortran preprocessor flags: $MY_FDEFS" >&5
    18117 $as_echo "$as_me: additional Fortran preprocessor flags: $MY_FDEFS" >&6;}
    18118 
    1811918408ac_config_files="$ac_config_files Makefile coinmumps.pc"
    1812018409
     
    1816918458      fi
    1817018459
     18460
     18461
     18462# libexport_attribute is set by AC_COIN_FINALIZE_FLAGS, either to __declspec(dllimport) or nothing
     18463# we want to use this to pass on a define for MUMPS_CALL in the .pc files Cflags
     18464MUMPS_EXPORT="$libexport_attribute"
     18465
     18466# and if it is dllimport, then we want dllexport when building Mumps
     18467if test "$libexport_attribute" = "__declspec(dllimport)" ; then
     18468  MY_DEFS="$MY_DEFS -DMUMPS_CALL=__declspec(dllexport)"
     18469fi
     18470
     18471{ $as_echo "$as_me:${as_lineno-$LINENO}: additional C preprocessor flags: $MY_DEFS" >&5
     18472$as_echo "$as_me: additional C preprocessor flags: $MY_DEFS" >&6;}
     18473{ $as_echo "$as_me:${as_lineno-$LINENO}: additional Fortran preprocessor flags: $MY_FDEFS" >&5
     18474$as_echo "$as_me: additional Fortran preprocessor flags: $MY_FDEFS" >&6;}
    1817118475
    1817218476
     
    1893719241enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
    1893819242pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
     19243AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
     19244DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
     19245OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
    1893919246enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
    1894019247enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
     
    1896719274reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
    1896819275reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
    18969 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
    1897019276deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
    1897119277file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
    1897219278file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
    1897319279want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
    18974 DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
    1897519280sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
    1897619281AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
     
    1913619441
    1913719442# Quote evaled strings.
    19138 for var in SHELL \
     19443for var in AS \
     19444DLLTOOL \
     19445OBJDUMP \
     19446SHELL \
    1913919447ECHO \
    1914019448PATH_SEPARATOR \
     
    1914919457lt_NL2SP \
    1915019458reload_flag \
    19151 OBJDUMP \
    1915219459deplibs_check_method \
    1915319460file_magic_cmd \
    1915419461file_magic_glob \
    1915519462want_nocaseglob \
    19156 DLLTOOL \
    1915719463sharedlib_from_linklib_cmd \
    1915819464AR \
     
    1990520211pic_mode=$pic_mode
    1990620212
     20213# Assembler program.
     20214AS=$lt_AS
     20215
     20216# DLL creation program.
     20217DLLTOOL=$lt_DLLTOOL
     20218
     20219# Object dumper program.
     20220OBJDUMP=$lt_OBJDUMP
     20221
    1990720222# Whether or not to build shared libraries.
    1990820223build_libtool_libs=$enable_shared
     
    1997820293to_tool_file_cmd=$lt_cv_to_tool_file_cmd
    1997920294
    19980 # An object symbol dumper.
    19981 OBJDUMP=$lt_OBJDUMP
    19982 
    1998320295# Method to check whether dependent libraries are shared objects.
    1998420296deplibs_check_method=$lt_deplibs_check_method
     
    1999220304# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
    1999320305want_nocaseglob=$lt_want_nocaseglob
    19994 
    19995 # DLL creation program.
    19996 DLLTOOL=$lt_DLLTOOL
    1999720306
    1999820307# Command to associate shared and link libraries.
     
    2055620865             -e '/$AR x/s/.*/( cd $f_ex_an_ar_dir ; for f in `$AR -nologo -list "$f_ex_an_ar_oldlib" | tr "\\r" " "` ; do lib -nologo -extract:$f "$f_ex_an_ar_oldlib"; done ); : \\/g' \
    2055720866             -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' \
    20558               \
     20867             -e 's|always_export_symbols=yes|always_export_symbols=no|g' \
    2055920868         libtool > libtool.tmp
    2056020869         mv libtool.tmp libtool
  • ThirdParty/Mumps/branches/mumps5/configure.ac

    r4007 r4008  
    3636
    3737# Initialize libtool
    38 AC_COIN_PROG_LIBTOOL(no-win32-dll)
     38AC_COIN_PROG_LIBTOOL
    3939
    4040# Add FLIBS to MUMPS_LFLAGS, so that they get into the .pc files section for static builds
     
    101101AC_SUBST(MY_FDEFS)
    102102
     103AC_CONFIG_FILES([Makefile coinmumps.pc])
     104
     105AC_COIN_FINALIZE_FLAGS([MUMPS])
     106
     107# libexport_attribute is set by AC_COIN_FINALIZE_FLAGS, either to __declspec(dllimport) or nothing
     108# we want to use this to pass on a define for MUMPS_CALL in the .pc files Cflags
     109MUMPS_EXPORT="$libexport_attribute"
     110AC_SUBST(MUMPS_EXPORT)
     111# and if it is dllimport, then we want dllexport when building Mumps
     112if test "$libexport_attribute" = "__declspec(dllimport)" ; then
     113  MY_DEFS="$MY_DEFS -DMUMPS_CALL=__declspec(dllexport)"
     114fi
     115
    103116AC_MSG_NOTICE([additional C preprocessor flags: $MY_DEFS])
    104117AC_MSG_NOTICE([additional Fortran preprocessor flags: $MY_FDEFS])
    105118
    106 AC_CONFIG_FILES([Makefile coinmumps.pc])
    107 
    108 AC_COIN_FINALIZE_FLAGS([MUMPS])
    109119AC_COIN_FINALIZE
Note: See TracChangeset for help on using the changeset viewer.