Changeset 13663


Ignore:
Timestamp:
Oct 4, 2019 8:52:04 AM (2 months ago)
Author:
randersson
Message:

#5819 Testing if changing the path to libpythonXY.a resolves the issue with numpy build errors. Note that these changes are obviously not final and are just for testing.

Location:
branches/dev-5819
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-5819/Makefile.am

    r13656 r13663  
    138138IPOPT_HOME=$(IPOPT64_HOME)
    139139
    140 CMAKE_PYTHON_INCLUDE=$(CMAKE_PYTHON64_INCLUDE)
    141 CMAKE_PYTHON_LIB=$(CMAKE_PYTHON_LIB64)
    142 CMAKE_CASADI_ARGS=$(CMAKE_CASADI_ARGS64)
     140#CMAKE_PYTHON_INCLUDE=$(CMAKE_PYTHON64_INCLUDE)
     141#CMAKE_PYTHON_LIB=$(CMAKE_PYTHON_LIB64)
     142#CMAKE_CASADI_ARGS=$(CMAKE_CASADI_ARGS64)
    143143endif
    144144
  • branches/dev-5819/Makefile.in

    r13662 r13663  
    141141CMAKE_PYTHON64_INCLUDE = @CMAKE_PYTHON64_INCLUDE@
    142142CMAKE_PYTHON64_LIB = @CMAKE_PYTHON64_LIB@
    143 @BUILD_WITH_PYTHON32_FALSE@CMAKE_PYTHON_INCLUDE = $(CMAKE_PYTHON64_INCLUDE)
    144143CMAKE_PYTHON_INCLUDE = @CMAKE_PYTHON_INCLUDE@
    145 @BUILD_WITH_PYTHON32_FALSE@CMAKE_PYTHON_LIB = $(CMAKE_PYTHON_LIB64)
    146144CMAKE_PYTHON_LIB = @CMAKE_PYTHON_LIB@
    147145CP = @CP@
     
    356354@BUILD_WITH_PYTHON32_FALSE@COMPILE_WITH_IPOPT = $(COMPILE_WITH_IPOPT64)
    357355@BUILD_WITH_PYTHON32_FALSE@COMPILE_WITH_IPOPT64 =
    358 @BUILD_WITH_PYTHON32_FALSE@CMAKE_CASADI_ARGS = $(CMAKE_CASADI_ARGS64)
    359356@NUMPY_NO_MSVCR_FALSE@NUMPY_NO_MSVCR_ARG =
    360357@NUMPY_NO_MSVCR_TRUE@NUMPY_NO_MSVCR_ARG = --no-msvcr="true"
     
    909906@COMPILE_WITH_IPOPT64_TRUE@ export PYTHONHOME=$(ORIG_PYTHON_HOME); \
    910907@COMPILE_WITH_IPOPT64_TRUE@ export PATH="$(ORIG_PATH)";
     908
     909#CMAKE_PYTHON_INCLUDE=$(CMAKE_PYTHON64_INCLUDE)
     910#CMAKE_PYTHON_LIB=$(CMAKE_PYTHON_LIB64)
     911#CMAKE_CASADI_ARGS=$(CMAKE_CASADI_ARGS64)
    911912
    912913casadi_interface: install_casadi_interface
  • branches/dev-5819/configure

    r13514 r13663  
    1939219392          { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using Python  installation ${PYTHON_HOME_ABS}" >&5
    1939319393$as_echo "Using Python  installation ${PYTHON_HOME_ABS}" >&6; }
    19394           CMAKE_PYTHON_LIB="-DPYTHON_LIBRARY=${PYTHON_HOME_ABS}/libs/libpython27.a"
     19394          CMAKE_PYTHON_LIB="-DPYTHON_LIBRARY=${PYTHON_HOME_ABS}/libs/libpython37.a"
    1939519395          CMAKE_PYTHON_INCLUDE="-DPYTHON_INCLUDE_DIR=${PYTHON_HOME_ABS}/include"
    1939619396
     
    1943119431          { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using Python 64bit installation ${PYTHON64_HOME_ABS}" >&5
    1943219432$as_echo "Using Python 64bit installation ${PYTHON64_HOME_ABS}" >&6; }
    19433           CMAKE_PYTHON64_LIB="-DPYTHON_LIBRARY=${PYTHON64_HOME_ABS}/libs/libpython27.a"
     19433          CMAKE_PYTHON64_LIB="-DPYTHON_LIBRARY=${PYTHON64_HOME_ABS}/libs/libpython37.a"
    1943419434          CMAKE_PYTHON64_INCLUDE="-DPYTHON_INCLUDE_DIR=${PYTHON64_HOME_ABS}/include"
    1943519435
     
    1946619466  WITH_PYTHON64_FALSE=
    1946719467fi
     19468
    1946819469
    1946919470# Since we always build JM 32bit together with 64bit we put this in a conditional for setting proper flags to assimulo and pyfmi
  • branches/dev-5819/configure.ac

    r13513 r13663  
    332332          $2="`cd ${$1}; pwd`"
    333333          AC_MSG_RESULT([Using Python $7 installation ${$2}])
    334           $5="-DPYTHON_LIBRARY=${$2}/libs/libpython27.a"
     334          $5="-DPYTHON_LIBRARY=${$2}/libs/libpython37.a"
    335335          $6="-DPYTHON_INCLUDE_DIR=${$2}/include"
    336336      ], [
Note: See TracChangeset for help on using the changeset viewer.