Changeset 13915


Ignore:
Timestamp:
Oct 31, 2019 7:17:10 AM (3 weeks ago)
Author:
randersson
Message:

#5819 Added back r13092 without including with the changes in the Makefile, for some mysterious reason it seems to loop itself and rebuild the same target over and over. Iniitally it was thought that it looped because it missed a cd ... but it appears while trying locally it still looped. Instead of wasting more time on the minor modification we stick with this change

Location:
branches/dev-5819
Files:
9 edited

Legend:

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

    r13909 r13915  
    352352CMAKE_CASADI_CXX_FLAG64 = -m64
    353353CMAKE_CASADI_COMPILER_ARGS64 = -m64 -fpermissive
    354 @BUILD_WITH_PYTHON32_FALSE@BUILD_WITH_PYTHON32_ARG =
    355 @BUILD_WITH_PYTHON32_TRUE@BUILD_WITH_PYTHON32_ARG = --force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2"
    356 @BUILD_WITH_PYTHON32_FALSE@DEP_SUFFIX = 64
    357 @BUILD_WITH_PYTHON32_TRUE@DEP_SUFFIX =
    358354@BUILD_WITH_PYTHON32_FALSE@TMP_CASADI_BUILD_DIR = $(CASADI_BUILD_DIR64)
    359355@BUILD_WITH_PYTHON32_TRUE@TMP_CASADI_BUILD_DIR = $(CASADI_BUILD_DIR)
     
    380376@NUMPY_NO_MSVCR_FALSE@NUMPY_NO_MSVCR_ARG =
    381377@NUMPY_NO_MSVCR_TRUE@NUMPY_NO_MSVCR_ARG = --no-msvcr="true"
     378@BUILD_WITH_PYTHON32_FALSE@BUILD_WITH_PYTHON32_ARG =
     379@BUILD_WITH_PYTHON32_TRUE@BUILD_WITH_PYTHON32_ARG = --force-32bit="true" --extra-c-flags="-mincoming-stack-boundary=2"
    382380@BUILD_WITH_PYTHON32_FALSE@ASSIMULO_CONFIG = win64_msys_py3
    383381@BUILD_WITH_PYTHON32_TRUE@ASSIMULO_CONFIG = win32_msys_py2
     382@BUILD_WITH_PYTHON32_FALSE@DEP_SUFFIX = 64
     383@BUILD_WITH_PYTHON32_TRUE@DEP_SUFFIX =
    384384
    385385# Hooks for extra build or install actions. Must be empty or the path of a shell script to execute.
  • branches/dev-5819/external/build_externals/configurations/Assimulo/unix/config

    r13909 r13915  
    1 -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)
    2 
    31BITNESS=64
    42FORCE_32_BIT=false
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win32

    r13909 r13915  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
     19# mkfile_path is the path to this file
    1920mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2021mkfile_dir := $(dir $(mkfile_path))
    2122include $(mkfile_dir)/win
     23
    2224BITNESS=32
    2325EXTRA_SETUP_ARGS=--with_openmp=True --no-msvcr=true --force-32bit=true --extra-c-flags=-mincoming-stack-boundary=2
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win32_cygwin_py2

    r13909 r13915  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
     19# mkfile_path is the path to this file
    1920mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2021mkfile_dir := $(dir $(mkfile_path))
    2122include $(mkfile_dir)/win
     23
    2224BITNESS=32
    2325EXTRA_SETUP_ARGS=--with_openmp=True --force-32bit=true --extra-c-flags=-mincoming-stack-boundary=2
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win32_msys_py2

    r13909 r13915  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
     19# mkfile_path is the path to this file
    1920mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2021mkfile_dir := $(dir $(mkfile_path))
    2122include $(mkfile_dir)/win
     23
    2224BITNESS=32
    2325EXTRA_SETUP_ARGS=--with_openmp=True --no-msvcr=true --force-32bit=true --extra-c-flags=-mincoming-stack-boundary=2
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win64

    r13909 r13915  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
     19# mkfile_path is the path to this file
    1920mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2021mkfile_dir := $(dir $(mkfile_path))
    2122include $(mkfile_dir)/win
     23
    2224BITNESS=64
    2325FORCE_32_BIT=false
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win64_msys_py2

    r13909 r13915  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
     19# mkfile_path is the path to this file
    1920mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2021mkfile_dir := $(dir $(mkfile_path))
    2122include $(mkfile_dir)/win
     23
    2224BITNESS=64
    2325FORCE_32_BIT=false
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win64_msys_py3

    r13909 r13915  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
     19
     20# mkfile_path is the path to this file
    1921mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2022mkfile_dir := $(dir $(mkfile_path))
    2123include $(mkfile_dir)/win
     24
    2225BITNESS=64
    2326EXTRA_SETUP_ARGS=--with_openmp=True
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win64py3

    r13909 r13915  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
     19# mkfile_path is the path to this file
    1920mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2021mkfile_dir := $(dir $(mkfile_path))
    2122include $(mkfile_dir)/win
     23
    2224BITNESS=64
    2325FORCE_32_BIT=false
    24 EXTRA_SETUP_ARGS=--with_openmp=True 
     26EXTRA_SETUP_ARGS=--with_openmp=True
    2527
    26 SUPERLU_HOME=$(BUILD_DIR)/superlu_install64
    27 SUNDIALS_HOME=$(BUILD_DIR)/sundials_install64
    28 BLAS_HOME=$(BUILD_DIR)/blas_install64
    29 LAPACK_HOME=$(BUILD_DIR)/lapack_install64
     28SUPERLU_HOME=$(BUILD_DIR)/superlu_install64msvs
     29SUNDIALS_HOME=$(BUILD_DIR)/sundials_install64msvs
     30BLAS_HOME=
     31LAPACK_HOME=
     32MKL_HOME=
    3033INSTALL_DIR_FOLDER=${WORKSPACE}/install/Python
    3134
Note: See TracChangeset for help on using the changeset viewer.