Skip to content
Permalink
Browse files

CMake: Set windows and mac to GENERIC

  • Loading branch information...
tmmsartor committed Jun 7, 2019
1 parent f9ef883 commit ddfd52ea9ce5c9868425a1f9f0138eaeca83b01f
Showing with 23 additions and 13 deletions.
  1. +2 −2 .appveyor.yml
  2. +2 −0 .travis.yml
  3. +6 −0 ci/osx/dispatch.sh
  4. +13 −11 ci/shared/script_acados_release.sh
@@ -9,13 +9,13 @@ install:
build_script:
- git submodule update --init --recursive
- cmake -E make_directory build
- cmake -E chdir build cmake ..
- cmake -E chdir build cmake -D BLASFEO_TARGET=GENERIC -D HPIPM_TARGET=GENERIC ..
- cmake --build build --config Debug
- cmake -E chdir build ctest --output-on-failure
- cmake --build build --config Release
- cmake -E chdir build ctest --output-on-failure
- rm -fr build
- cmake -E make_directory build
- cmake -E make_directory appveyor-artifacts
- cmake -E chdir build cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%\appveyor-artifacts ..
- cmake -E chdir build cmake -D BLASFEO_TARGET=GENERIC -D HPIPM_TARGET=GENERIC -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%\appveyor-artifacts ..
- cmake --build build --target install
@@ -1,6 +1,8 @@
language: c
env:
global:
- BLASFEO_TARGET=X64_INTEL_HASWELL
- HPIPM_TARGET=AVX
- CASADIPATH="${HOME}/casadi"
- ACADOS_INSTALL_DIR="${HOME}/acados"
- DEPLOY_FOLDER="${HOME}/deploy"
@@ -1,5 +1,11 @@
#!/bin/bash

if [ "${SECTION}" = 'before_install' ]; then
# export GENERIC target for osx
export BLASFEO_TARGET=GENERIC
export HPIPM_TARGET=GENERIC
fi

if [ "${SECTION}" = 'install' ]; then
source "${SCRIPT_DIR}/install_ccache.sh";
source "${SHARED_SCRIPT_DIR}/install_eigen.sh";
@@ -19,17 +19,19 @@ function build_acados {
[ -d ./build ] && rm -r build;
cmake -E make_directory build;
cmake -E chdir build cmake \
-D CMAKE_BUILD_TYPE="${BUILD_TYPE}" \
-D ACADOS_UNIT_TESTS="${ACADOS_UNIT_TESTS}" \
-D ACADOS_WITH_QPOASES="${ACADOS_WITH_QPOASES}" \
-D ACADOS_LINT="${ACADOS_LINT}" \
-D ACADOS_INSTALL_DIR="${ACADOS_INSTALL_DIR}" \
-D Matlab_ROOT_DIR="${MATLAB_ROOT}" \
-D SWIG_MATLAB="${SWIG_MATLAB}" \
-D COVERAGE="${COVERAGE}" \
-D SWIG_PYTHON="${SWIG_PYTHON}" \
-D BUILD_SHARED_LIBS=ON \
..;
-D BLASFEO_TARGET="${BLASFEO_TARGET}" \
-D HPIPM_TARGET="${HPIPM_TARGET}" \
-D CMAKE_BUILD_TYPE="${BUILD_TYPE}" \
-D ACADOS_UNIT_TESTS="${ACADOS_UNIT_TESTS}" \
-D ACADOS_WITH_QPOASES="${ACADOS_WITH_QPOASES}" \
-D ACADOS_LINT="${ACADOS_LINT}" \
-D ACADOS_INSTALL_DIR="${ACADOS_INSTALL_DIR}" \
-D Matlab_ROOT_DIR="${MATLAB_ROOT}" \
-D SWIG_MATLAB="${SWIG_MATLAB}" \
-D COVERAGE="${COVERAGE}" \
-D SWIG_PYTHON="${SWIG_PYTHON}" \
-D BUILD_SHARED_LIBS=ON \
..;
if [ "${ACADOS_LINT}" = 'ON' ]; then
cmake --build build --target lint;
[ $? -ne 0 ] && exit 110;

0 comments on commit ddfd52e

Please sign in to comment.
You can’t perform that action at this time.