Changeset 13510


Ignore:
Timestamp:
Sep 17, 2019 12:57:50 PM (3 months ago)
Author:
randersson
Message:

#5819 Fixed such that build system defaults to 64bit in case user does no longer choose to build both 32bit and 64bit for python. Note that changes in configure and Makefile.in are automatically generated solely by changes in configure.ac and Makefile.am

Location:
branches/dev-5819
Files:
4 edited

Legend:

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

    r13223 r13510  
    269269endif
    270270
     271if BUILD_WITH_PYTHON32
     272BUILD_WITH_PYTHON32_ARG=--force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2"
     273DEP_SUFFIX=
     274else
     275BUILD_WITH_PYTHON32_ARG=
     276DEP_SUFFIX=64
     277endif
     278
    271279
    272280build-python-packages:
     
    279287    case $(build) in \
    280288    *-cygwin*) \
    281     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/ --force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
     289    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) --prefix=$(assimulo_install_dir) ;; \
    282290    *-mingw*) \
    283     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/ --force-32bit="true" $(NUMPY_NO_MSVCR_ARG) --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
     291    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) ;; \
    284292    *) \
    285     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) ;; \
     293    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) ;; \
    286294    esac
    287295if JM_WIN64
     
    306314    case $(build) in \
    307315    *-cygwin*) \
    308     python setup.py install --sundials-home=$(SUNDIALS_HOME) --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
     316    python setup.py install --sundials-home=$(SUNDIALS_HOME) --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ $(BUILD_WITH_PYTHON32_ARG) --prefix=$(assimulo_install_dir) ;; \
    309317    *-mingw*) \
    310     python setup.py install --sundials-home=$(SUNDIALS_HOME) --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --force-32bit="true" $(NUMPY_NO_MSVCR_ARG) --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
     318    python setup.py install --sundials-home=$(SUNDIALS_HOME) --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ $(BUILD_WITH_PYTHON32_ARG) $(NUMPY_NO_MSVCR_ARG) --prefix=$(assimulo_install_dir) ;; \
    311319    *) \
    312320    python setup.py install --sundials-home=$(SUNDIALS_HOME) --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --prefix=$(assimulo_install_dir) ;; \
     
    346354    case $(build) in \
    347355    *-cygwin*) \
    348     python setup.py install --fmil-home=$(abs_builddir)/FMIL_install/ --force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(pyfmi_install_dir) ;; \
     356    python setup.py install --fmil-home=$(abs_builddir)/FMIL_install$(DEP_SUFFIX)/ $(BUILD_WITH_PYTHON32_ARG) --prefix=$(pyfmi_install_dir) ;; \
    349357    *-mingw*) \
    350     python setup.py install --fmil-home=$(abs_builddir)/FMIL_install/ --force-32bit="true" $(NUMPY_NO_MSVCR_ARG) --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(pyfmi_install_dir) ;; \
     358    python setup.py install --fmil-home=$(abs_builddir)/FMIL_install$(DEP_SUFFIX)/ $(BUILD_WITH_PYTHON32_ARG) $(NUMPY_NO_MSVCR_ARG) --prefix=$(pyfmi_install_dir) ;; \
    351359    *) \
    352     python setup.py install --fmil-home=$(abs_builddir)/FMIL_install/ --prefix=$(pyfmi_install_dir) ;; \
     360    python setup.py install --fmil-home=$(abs_builddir)/FMIL_install$(DEP_SUFFIX)/ --prefix=$(pyfmi_install_dir) ;; \
    353361    esac
    354362    rm -rf build
     
    421429endif
    422430endif
    423     for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     431    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.7 Lib; do \
    424432    if [ -e $(assimulo_install_dir)/$${pkgdir}/site-packages/ ]; \
    425433    then \
     
    428436    fi; \
    429437    done
    430     for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     438    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.7 Lib; do \
    431439    if [ -e $(pymodelica_install_dir)/$${pkgdir}/site-packages/ ]; \
    432440    then \
     
    435443    fi; \
    436444    done
    437     for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     445    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.7 Lib; do \
    438446    if [ -e $(pyjmi_install_dir)/$${pkgdir}/site-packages/ ]; \
    439447    then \
     
    442450    fi; \
    443451    done
    444     for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     452    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.7 Lib; do \
    445453    if [ -e $(pyfmi_install_dir)/$${pkgdir}/site-packages/ ]; \
    446454    then \
     
    450458    done
    451459if JM_WIN64
    452     for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     460    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.7 Lib; do \
    453461    if [ -e $(assimulo_install_dir64)/$${pkgdir}/site-packages/ ]; \
    454462    then \
     
    457465    fi; \
    458466    done
    459     for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     467    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.7 Lib; do \
    460468    if [ -e $(pymodelica_install_dir64)/$${pkgdir}/site-packages/ ]; \
    461469    then \
     
    464472    fi; \
    465473    done
    466     for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     474    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.7 Lib; do \
    467475    if [ -e $(pyjmi_install_dir64)/$${pkgdir}/site-packages/ ]; \
    468476    then \
     
    471479    fi; \
    472480    done
    473     for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     481    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.7 Lib; do \
    474482    if [ -e $(pyfmi_install_dir64)/$${pkgdir}/site-packages/ ]; \
    475483    then \
  • branches/dev-5819/Makefile.in

    r13223 r13510  
    339339@NUMPY_NO_MSVCR_FALSE@NUMPY_NO_MSVCR_ARG =
    340340@NUMPY_NO_MSVCR_TRUE@NUMPY_NO_MSVCR_ARG = --no-msvcr="true"
     341@BUILD_WITH_PYTHON32_FALSE@BUILD_WITH_PYTHON32_ARG =
     342@BUILD_WITH_PYTHON32_TRUE@BUILD_WITH_PYTHON32_ARG = --force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2"
     343@BUILD_WITH_PYTHON32_FALSE@DEP_SUFFIX = 64
     344@BUILD_WITH_PYTHON32_TRUE@DEP_SUFFIX =
    341345
    342346# Hooks for extra build or install actions. Must be empty or the path of a shell script to execute.
     
    361365    $(JAVA_BUILD_DIR)/bin/separateProcess.jar
    362366
    363 ant_output_options=$(JAVA_BUILD_DIR)/src/build/DefaultOptions.xml
     367ant_output_options = $(JAVA_BUILD_DIR)/src/build/DefaultOptions.xml
    364368BEAVER_INSTALL_DIR = $(DESTDIR)$(prefix)/ThirdParty/Beaver
    365369BEAVER_SOURCE = $(abs_top_srcdir)/Compiler/ModelicaFrontEnd/ThirdParty/Beaver
     
    10241028@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ case $(build) in \
    10251029@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ *-cygwin*) \
    1026 @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/ --force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
     1030@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) --prefix=$(assimulo_install_dir) ;; \
    10271031@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ *-mingw*) \
    1028 @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/ --force-32bit="true" $(NUMPY_NO_MSVCR_ARG) --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
     1032@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) ;; \
    10291033@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ *) \
    1030 @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) ;; \
     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) ;; \
    10311035@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ esac
    10321036@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@  mkdir -p $(assimulo_build_dir64); \
     
    10451049@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    case $(build) in \
    10461050@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    *-cygwin*) \
    1047 @PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    python setup.py install --sundials-home=$(SUNDIALS_HOME) --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
     1051@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    python setup.py install --sundials-home=$(SUNDIALS_HOME) --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ $(BUILD_WITH_PYTHON32_ARG) --prefix=$(assimulo_install_dir) ;; \
    10481052@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    *-mingw*) \
    1049 @PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    python setup.py install --sundials-home=$(SUNDIALS_HOME) --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --force-32bit="true" $(NUMPY_NO_MSVCR_ARG) --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(assimulo_install_dir) ;; \
     1053@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    python setup.py install --sundials-home=$(SUNDIALS_HOME) --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ $(BUILD_WITH_PYTHON32_ARG) $(NUMPY_NO_MSVCR_ARG) --prefix=$(assimulo_install_dir) ;; \
    10501054@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    *) \
    10511055@PYTHON_ENABLED_TRUE@@WITH_OPENMP_FALSE@    python setup.py install --sundials-home=$(SUNDIALS_HOME) --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --prefix=$(assimulo_install_dir) ;; \
     
    10761080@PYTHON_ENABLED_TRUE@   case $(build) in \
    10771081@PYTHON_ENABLED_TRUE@   *-cygwin*) \
    1078 @PYTHON_ENABLED_TRUE@   python setup.py install --fmil-home=$(abs_builddir)/FMIL_install/ --force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(pyfmi_install_dir) ;; \
     1082@PYTHON_ENABLED_TRUE@   python setup.py install --fmil-home=$(abs_builddir)/FMIL_install$(DEP_SUFFIX)/ $(BUILD_WITH_PYTHON32_ARG) --prefix=$(pyfmi_install_dir) ;; \
    10791083@PYTHON_ENABLED_TRUE@   *-mingw*) \
    1080 @PYTHON_ENABLED_TRUE@   python setup.py install --fmil-home=$(abs_builddir)/FMIL_install/ --force-32bit="true" $(NUMPY_NO_MSVCR_ARG) --extra-c-flags="-mincoming-stack-boundary=2" --prefix=$(pyfmi_install_dir) ;; \
     1084@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) ;; \
    10811085@PYTHON_ENABLED_TRUE@   *) \
    1082 @PYTHON_ENABLED_TRUE@   python setup.py install --fmil-home=$(abs_builddir)/FMIL_install/ --prefix=$(pyfmi_install_dir) ;; \
     1086@PYTHON_ENABLED_TRUE@   python setup.py install --fmil-home=$(abs_builddir)/FMIL_install$(DEP_SUFFIX)/ --prefix=$(pyfmi_install_dir) ;; \
    10831087@PYTHON_ENABLED_TRUE@   esac
    10841088@PYTHON_ENABLED_TRUE@   rm -rf build
     
    11311135@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    cp Python/src/required_defaults.py $(DESTDIR)$(prefix)/Python_64/
    11321136@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_PYTHON64_TRUE@    [ $(abs_top_srcdir) == $(DESTDIR)$(prefix) ] && echo "Installing in dist directory, don't copy LICENSE file" || cp $(abs_top_srcdir)/Python/LICENSE $(DESTDIR)$(prefix)/Python_64
    1133 @PYTHON_ENABLED_TRUE@   for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     1137@PYTHON_ENABLED_TRUE@   for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.7 Lib; do \
    11341138@PYTHON_ENABLED_TRUE@   if [ -e $(assimulo_install_dir)/$${pkgdir}/site-packages/ ]; \
    11351139@PYTHON_ENABLED_TRUE@   then \
     
    11381142@PYTHON_ENABLED_TRUE@   fi; \
    11391143@PYTHON_ENABLED_TRUE@   done
    1140 @PYTHON_ENABLED_TRUE@   for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     1144@PYTHON_ENABLED_TRUE@   for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.7 Lib; do \
    11411145@PYTHON_ENABLED_TRUE@   if [ -e $(pymodelica_install_dir)/$${pkgdir}/site-packages/ ]; \
    11421146@PYTHON_ENABLED_TRUE@   then \
     
    11451149@PYTHON_ENABLED_TRUE@   fi; \
    11461150@PYTHON_ENABLED_TRUE@   done
    1147 @PYTHON_ENABLED_TRUE@   for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     1151@PYTHON_ENABLED_TRUE@   for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.7 Lib; do \
    11481152@PYTHON_ENABLED_TRUE@   if [ -e $(pyjmi_install_dir)/$${pkgdir}/site-packages/ ]; \
    11491153@PYTHON_ENABLED_TRUE@   then \
     
    11521156@PYTHON_ENABLED_TRUE@   fi; \
    11531157@PYTHON_ENABLED_TRUE@   done
    1154 @PYTHON_ENABLED_TRUE@   for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     1158@PYTHON_ENABLED_TRUE@   for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.7 Lib; do \
    11551159@PYTHON_ENABLED_TRUE@   if [ -e $(pyfmi_install_dir)/$${pkgdir}/site-packages/ ]; \
    11561160@PYTHON_ENABLED_TRUE@   then \
     
    11591163@PYTHON_ENABLED_TRUE@   fi; \
    11601164@PYTHON_ENABLED_TRUE@   done
    1161 @JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     1165@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.7 Lib; do \
    11621166@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    if [ -e $(assimulo_install_dir64)/$${pkgdir}/site-packages/ ]; \
    11631167@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    then \
     
    11661170@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    fi; \
    11671171@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    done
    1168 @JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     1172@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.7 Lib; do \
    11691173@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    if [ -e $(pymodelica_install_dir64)/$${pkgdir}/site-packages/ ]; \
    11701174@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    then \
     
    11731177@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    fi; \
    11741178@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    done
    1175 @JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     1179@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.7 Lib; do \
    11761180@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    if [ -e $(pyjmi_install_dir64)/$${pkgdir}/site-packages/ ]; \
    11771181@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    then \
     
    11801184@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    fi; \
    11811185@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    done
    1182 @JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 Lib; do \
     1186@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    for pkgdir in lib/python2.5 lib/python2.6 lib/python2.7 lib/python3.7 lib64/python2.5 lib64/python2.6 lib64/python2.7 lib64/python3.7 Lib; do \
    11831187@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    if [ -e $(pyfmi_install_dir64)/$${pkgdir}/site-packages/ ]; \
    11841188@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@    then \
  • branches/dev-5819/configure

    r12302 r13510  
    629629JVMDLL_HOME
    630630ORIG_PATH
     631BUILD_WITH_PYTHON32_FALSE
     632BUILD_WITH_PYTHON32_TRUE
    631633WITH_PYTHON64_FALSE
    632634WITH_PYTHON64_TRUE
     
    1946519467fi
    1946619468
     19469# Since we always build 32bit together with 64bit we put this in a conditional for setting proper flags to assimulo and pyfmi
     19470 if WITH_PYTHON64; then
     19471  BUILD_WITH_PYTHON32_TRUE=
     19472  BUILD_WITH_PYTHON32_FALSE='#'
     19473else
     19474  BUILD_WITH_PYTHON32_TRUE='#'
     19475  BUILD_WITH_PYTHON32_FALSE=
     19476fi
     19477
    1946719478
    1946819479
     
    1997119982if test -z "${WITH_PYTHON64_TRUE}" && test -z "${WITH_PYTHON64_FALSE}"; then
    1997219983  as_fn_error $? "conditional \"WITH_PYTHON64\" was never defined.
     19984Usually this means the macro was only invoked conditionally." "$LINENO" 5
     19985fi
     19986if test -z "${BUILD_WITH_PYTHON32_TRUE}" && test -z "${BUILD_WITH_PYTHON32_FALSE}"; then
     19987  as_fn_error $? "conditional \"BUILD_WITH_PYTHON32\" was never defined.
    1997319988Usually this means the macro was only invoked conditionally." "$LINENO" 5
    1997419989fi
  • branches/dev-5819/configure.ac

    r12302 r13510  
    359359PYTHON_DISTRO_CHECK([PYTHON64_HOME], [PYTHON64_HOME_ABS], [PYTHON64_LIB], [PYTHON64_INCLUDE], [CMAKE_PYTHON64_LIB], [CMAKE_PYTHON64_INCLUDE], [64bit])
    360360AM_CONDITIONAL([WITH_PYTHON64], [test "x$PYTHON64_HOME" != x])
     361# Since we always build 32bit together with 64bit we put this in a conditional for setting proper flags to assimulo and pyfmi
     362AM_CONDITIONAL([BUILD_WITH_PYTHON32],[WITH_PYTHON64])
    361363
    362364AC_SUBST(ORIG_PATH)
Note: See TracChangeset for help on using the changeset viewer.