Changeset 14078


Ignore:
Timestamp:
Nov 15, 2019 12:48:56 PM (3 weeks ago)
Author:
randersson
Message:

#5819 Updated Assimulo build system with latest changes

Location:
branches/dev-5819
Files:
4 edited

Legend:

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

    r13802 r14078  
    6464
    6565else
     66case $(build) in \
     67*-cygwin*|*-mingw*) \
     68cmake $(MC_SRC_SWIG) -G "MSYS Makefiles" -DCMAKE_CXX_COMPILER_ARG1="$(TMP_CMAKE_CASADI_CXX_FLAG)" -DCMAKE_CXX_FLAGS="$(TMP_CMAKE_CASADI_CXX_FLAG)" \
     69    -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)";; \
     70*) \
     71cmake $(MC_SRC_SWIG) \
     72    -DIFCASADI_OUTDIR="$(MC_CASADI_BUILD)" -DCASADI_HOME="$(CASADI_HOME)" -DCASADI_BUILD_DIR="$(TMP_CASADI_BUILD_DIR)";; \
     73esac
    6674TMP_CASADI_BUILD_DIR=$(CASADI_BUILD_DIR64)
    6775TMP_SWIGCHECK_BUILD_DIR=$(SWIGCHECK_BUILD_DIR64)
  • branches/dev-5819/ThirdParty/build_thirdparties/Jenkins/ci/vars/buildThirdPartyFromMake.groovy

    r13769 r14078  
    1 def call(JM_CHECKOUT_PATH, JM_BRANCH, INSTALL_PATH, module,bitness=["32", "64"], stash=false, archive=true, target_suffix="") {
     1def call(JM_CHECKOUT_PATH, JM_BRANCH, INSTALL_PATH, module,bitness=["32", "64"], stash=false, archive=false, target_suffix="") {
    22    if (JM_CHECKOUT_PATH != null) {
    33        checkoutJM(${JM_BRANCH})
  • branches/dev-5819/external/build_externals/Jenkins/ci/vars/buildAssimulo.groovy

    r14007 r14078  
    3131            cd \${JM_HOME}/external/build_externals/build/assimulo
    3232           
    33             make clean USER_CONFIG=${USER_CONFIG} BUILD_DIR=\${JENKINS_BUILD_DIR}
    34             make ${TARGET} USER_CONFIG=${USER_CONFIG} JM_HOME=\${JM_HOME} BUILD_DIR=\${JENKINS_BUILD_DIR} WORKSPACE=\${JM_HOME}/.. INSTALL_DIR_FOLDER=${INSTALL_PATH_UNIX}/${msvs_suffix}
     33            make clean USER_CONFIG=${USER_CONFIG} BUILD_DIR=\${JENKINS_BUILD_DIR} INSTALL_DIR_FOLDER=${INSTALL_PATH_UNIX}/${bit}${msvs_suffix}
     34            make ${TARGET} USER_CONFIG=${USER_CONFIG}${bit} JM_HOME=\${JM_HOME} BUILD_DIR=\${JENKINS_BUILD_DIR} WORKSPACE=\${JM_HOME}/.. INSTALL_DIR_FOLDER=${INSTALL_PATH_UNIX}/${bit}${msvs_suffix}
    3535            """, extra_bat);
    3636            if ("${TARGET}" == "folder") {
     
    4545                        stash includes: "Python_${bit}/**", name: "Python_${bit}_assimulo_${TARGET}"
    4646                    }
    47                     if (msvs_suffix == "msvs") {
    48                         archiveArtifacts artifacts: "${msvs_suffix}/assimulo/**", fingerprint: false
     47                    if (TARGET == "wheel") {
     48                        archiveArtifacts artifacts: "${bit}/${TARGET}/**", fingerprint: false
    4949                    } else {
    50                         archiveArtifacts artifacts: "assimulo/**", fingerprint: false
     50                        // archiving the entire directory
     51                        if (msvs_suffix == "msvs") {
     52                            archiveArtifacts artifacts: "${bit}${msvs_suffix}/assimulo/**", fingerprint: false
     53                        } else {
     54                            archiveArtifacts artifacts: "${bit}/assimulo/**", fingerprint: false
     55                        }
    5156                    }
    5257                }
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win64

    r13915 r14078  
    2626EXTRA_SETUP_ARGS=--no-msvcr=true --with_openmp=True
    2727
    28 INSTALL_DIR_FOLDER=${SDK_HOME}/install/Python_64
    2928SUPERLU_HOME=$(BUILD_DIR)/superlu_install64
    3029SUNDIALS_HOME=$(BUILD_DIR)/sundials_install64
Note: See TracChangeset for help on using the changeset viewer.