Skip to content
Permalink
Browse files

switched osqp branch to develop, bumped osqp, disabled internal PROFI…

…LING and user interrupts in OSQP
  • Loading branch information...
bnovoselnik committed Dec 18, 2018
1 parent 028c6f2 commit e33c8a85268638afa59d69b02da829c9780828c5
Showing with 5 additions and 1 deletion.
  1. +1 −0 .gitmodules
  2. +3 −0 external/CMakeLists.txt
  3. +1 −1 external/osqp
@@ -26,3 +26,4 @@
[submodule "external/osqp"]
path = external/osqp
url = https://github.com/oxfordcontrol/osqp.git
branch = develop
@@ -29,6 +29,7 @@ set(BLASFEO_HEADERS_INSTALLATION_DIRECTORY "include/blasfeo/include" CACHE STRIN
set(HPIPM_HEADERS_INSTALLATION_DIRECTORY "include/hpipm/include" CACHE STRING "")
set(HPMPC_HEADERS_INSTALLATION_DIRECTORY "include/hpmpc/include" CACHE STRING "")


if(CMAKE_SYSTEM_NAME MATCHES "dSpace")
set(USE_C99_MATH OFF CACHE BOOL "fmax is not implemented for dSpace.")
endif()
@@ -54,6 +55,8 @@ if(ACADOS_WITH_QPOASES)
endif()

if(ACADOS_WITH_OSQP)
set(PROFILING OFF CACHE BOOL "Turn off profiling in OSQP")
set(CTRLC OFF CACHE BOOL "Turn off CTRLC in OSQP")
add_subdirectory(osqp)
endif()

0 comments on commit e33c8a8

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