Changeset 791


Ignore:
Timestamp:
Feb 1, 2020 3:05:03 PM (2 months ago)
Author:
kulshres
Message:

fixes for python and swig build

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/ADOL-C/swig/Makefile.am

    r771 r791  
    2121if SPARSE
    2222install:
    23         ${PYTHON} setup.py install --prefix=${prefix} --only-swig
     23        CXX=${CXX} ${PYTHON} setup.py install --prefix=${prefix} --only-swig
    2424endif
    2525endif
  • trunk/ADOL-C/swig/setup.py

    r771 r791  
    156156       
    157157incdirs = np_dist.get_numpy_include_dirs()
    158 python_ldflags = subprocess.check_output(['python-config','--ldflags'],universal_newlines=True)
     158#python_ldflags = subprocess.check_output(['python-config','--ldflags'],universal_newlines=True)
    159159
    160160adolc_mod = Extension('_adolc',
     
    165165                      include_dirs=incdirs,
    166166                      extra_compile_args=['-std=c++11', '-fPIC', '-w'],
    167                       extra_link_args=['-Wl,-no-undefined ' + python_ldflags.rstrip()])
     167                      #extra_link_args=[python_ldflags.rstrip() + ' -Wl,-no-undefined']
     168)
    168169
    169170setup(name='adolc',
  • trunk/configure.ac

    r790 r791  
    500500
    501501AM_PATH_PYTHON([2.7],[python_found=yes],[python_found=no])
    502 AM_CONDITIONAL(PYTHONFOUND, [test x$python_found = xyes])
     502AC_PATH_PROG(SWIG, swig, [no])
     503AM_CONDITIONAL(PYTHONFOUND, [test x$python_found = xyes && test x$SWIG != xno])
    503504###########################################################################
    504505#                      COIN_PATCH_LIBTOOL_CYGWIN                          #
     
    645646    warn=true
    646647fi
    647 if test x$sparse = xyes && test x$python_found = xyes; then
     648if test x$sparse = xyes && test x$python_found = xyes && test x$SWIG != xno; then
    648649   echo \
    649650"  Build with python swig module:      yes"
    650651else
    651    echo \
    652 "  Build with python swig module:      no"
     652   echo -n \
     653"  Build with python swig module:      no "
     654   if test x$sparse = xno && test x$python_found = xyes && test x$SWIG != xno; then
     655     echo \
     656"(due to sparse drivers disabled)"
     657  elif test x$sparse = xyes && ( $test x$python_found = xno || test x$SWIG = xno ); then
     658     echo \
     659"(due to python/swig missing)"
     660  else
     661    echo \
     662"(due to sparse drivers disabled and python/swig missing)"
     663  fi
    653664fi
    654665echo
Note: See TracChangeset for help on using the changeset viewer.