Changeset 13536


Ignore:
Timestamp:
Sep 19, 2019 8:15:00 AM (3 months ago)
Author:
randersson
Message:

#5819 Also applied same changes to Makefile.in that should have been with r13535

File:
1 edited

Legend:

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

    r13510 r13536  
    10321032@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ python setup.py install --with_openmp=True --superlu-home=$(abs_builddir)/superlu_build$(DEP_SUFFIX)/ --sundials-home=$(SUNDIALS_HOME)$(DEP_SUFFIX) --sundials-with-superlu=True --blas-home=$(abs_builddir)/blas_install$(DEP_SUFFIX)/ --lapack-home=$(abs_builddir)/lapack_install$(DEP_SUFFIX)/ $(BUILD_WITH_PYTHON32_ARG) $(NUMPY_NO_MSVCR_ARG) --prefix=$(assimulo_install_dir) ;; \
    10331033@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ *) \
    1034 @PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ python setup.py install --with_openmp=True --superlu-home=$(abs_builddir)/superlu_build$(DEP_SUFFIX)/ --sundials-home=$(SUNDIALS_HOME)$(DEP_SUFFIX) --sundials-with-superlu=True --blas-home=$(abs_builddir)/blas_install$(DEP_SUFFIX)/ --lapack-home=$(abs_builddir)/lapack_install$(DEP_SUFFIX)/ --prefix=$(assimulo_install_dir) ;; \
     1034@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ python setup.py install --with_openmp=True --superlu-home=$(abs_builddir)/superlu_build/ --sundials-home=$(SUNDIALS_HOME) --sundials-with-superlu=True --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --prefix=$(assimulo_install_dir) ;; \
    10351035@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ esac
    10361036@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@  mkdir -p $(assimulo_build_dir64); \
     
    10841084@PYTHON_ENABLED_TRUE@   python setup.py install --fmil-home=$(abs_builddir)/FMIL_install$(DEP_SUFFIX)/ $(BUILD_WITH_PYTHON32_ARG) $(NUMPY_NO_MSVCR_ARG) --prefix=$(pyfmi_install_dir) ;; \
    10851085@PYTHON_ENABLED_TRUE@   *) \
    1086 @PYTHON_ENABLED_TRUE@   python setup.py install --fmil-home=$(abs_builddir)/FMIL_install$(DEP_SUFFIX)/ --prefix=$(pyfmi_install_dir) ;; \
     1086@PYTHON_ENABLED_TRUE@   python setup.py install --fmil-home=$(abs_builddir)/FMIL_install/ --prefix=$(pyfmi_install_dir) ;; \
    10871087@PYTHON_ENABLED_TRUE@   esac
    10881088@PYTHON_ENABLED_TRUE@   rm -rf build
Note: See TracChangeset for help on using the changeset viewer.