Skip to content
Permalink
Browse files

CMake: Update defaults

  • Loading branch information...
tmmsartor committed Jun 7, 2019
1 parent 166fd2d commit f9ef88384e539b43a7e30fe296fe33c33cfad300
Showing with 16 additions and 10 deletions.
  1. +1 −0 .travis.yml
  2. +4 −4 CMakeLists.txt
  3. +5 −5 Makefile.rule
  4. +5 −0 ci/shared/script_acados_release.sh
  5. +1 −1 cmake/acadosConfig.cmake.in
@@ -5,6 +5,7 @@ env:
- ACADOS_INSTALL_DIR="${HOME}/acados"
- DEPLOY_FOLDER="${HOME}/deploy"
- ACADOS_UNIT_TESTS='ON'
- ACADOS_WITH_QPOASES='ON';
- ACADOS_LINT="OFF"
- SWIG_MATLAB="OFF"
- SWIG_PYTHON="OFF"
@@ -33,16 +33,16 @@ set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
### Defaults

set(ACADOS_INSTALL_DIR "/usr/local" CACHE STRING "Installation path to /usr/local")
set(BLASFEO_TARGET "GENERIC" CACHE STRING "BLASFEO Target architecture")
set(HPIPM_TARGET "GENERIC" CACHE STRING "HPIPM Target architecture")
set(BLASFEO_TARGET "X64_INTEL_HASWELL" CACHE STRING "BLASFEO Target architecture")
set(HPIPM_TARGET "AVX" CACHE STRING "HPIPM Target architecture")
set(LA "HIGH_PERFORMANCE" CACHE STRING "Linear algebra optimization level")

# Additional targets
option(ACADOS_UNIT_TESTS "Compile Unit tests" OFF)
option(ACADOS_EXAMPLES "Compile Examples" OFF)
option(ACADOS_LINT "Compile Lint" OFF)
# Extarnal libs
option(ACADOS_WITH_QPOASES "qpOASES solver" ON)
option(ACADOS_WITH_QPOASES "qpOASES solver" OFF)
option(ACADOS_WITH_HPMPC "HPMPC solver" OFF)
option(ACADOS_WITH_QORE "QORE solver" OFF)
option(ACADOS_WITH_OOQP "OOQP solver" OFF)
@@ -107,7 +107,7 @@ endif()

if(ACADOS_WITH_HPMPC MATCHES ON AND CMAKE_C_COMPILER_ID MATCHES "MSVC")
set(ACADOS_WITH_HPMPC OFF CACHE BOOL "HPMPC solver" FORCE)
message(WARNING "HPMPC is not compatible with MSVC")
message(WARNING "HPMPC has been disabled, not compatible with ${CMAKE_C_COMPILER_ID}")
endif()

if(ACADOS_WITH_OOQP MATCHES ON)
@@ -32,7 +32,7 @@ BLASFEO_VERSION = HIGH_PERFORMANCE
# BLASFEO_VERSION = BLAS_WRAPPER

## BLASFEO target
# BLASFEO_TARGET = X64_INTEL_HASWELL
BLASFEO_TARGET = X64_INTEL_HASWELL
# BLASFEO_TARGET = X64_INTEL_SANDY_BRIDGE
# BLASFEO_TARGET = X64_INTEL_CORE
#
@@ -45,15 +45,15 @@ BLASFEO_VERSION = HIGH_PERFORMANCE
# TARGET = ARMV7A_ARM_CORTEX_A15
# TARGET = ARMV7A_ARM_CORTEX_A7
#
BLASFEO_TARGET = GENERIC
# BLASFEO_TARGET = GENERIC

## HPIPM path
HPIPM_PATH = $(EXT_PATH)/hpipm
#HPIPM_PATH = /home/gianluca/hpipm

## HPIPM target
# HPIPM_TARGET = AVX
HPIPM_TARGET = GENERIC
HPIPM_TARGET = AVX
# HPIPM_TARGET = GENERIC

## HPMPC path
HPMPC_PATH = $(EXT_PATH)/hpmpc
@@ -77,7 +77,7 @@ ACADOS_WITH_OPENMP = 0
ACADOS_NUM_THREADS = 4

# include QPOASES
ACADOS_WITH_QPOASES = 1
ACADOS_WITH_QPOASES = 0

# include HPMPC
ACADOS_WITH_HPMPC = 0
@@ -12,11 +12,16 @@ function build_acados {
ACADOS_LINT='OFF';
fi

if [ "${ACADOS_UNIT_TESTS}" = 'ON' ]; then
ACADOS_WITH_QPOASES='ON';
fi

[ -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}" \
@@ -3,8 +3,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") # for FindOpenBLA

find_package(blasfeo)
find_package(hpipm)
find_package(qpOASES_e)

find_package(qpOASES_e)
find_package(hpmpc)
find_package(qpdunes)
find_package(qore)

0 comments on commit f9ef883

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