Permalink
Browse files

changed install.sh to install into ~/.local/lib; removed some files; …

…cpp:fix warning
  • Loading branch information...
FreyJo committed Nov 22, 2018
1 parent a6cb49a commit 01b9a06df92e11d396e46194e2516677d3d4e9fd
Showing with 13 additions and 61 deletions.
  1. +2 −0 CMakeLists.txt
  2. +7 −6 install.sh
  3. +4 −1 interfaces/acados_cpp/integrator.cpp
  4. +0 −27 rebuild.sh
  5. +0 −27 rebuild_debug_python.sh
@@ -29,6 +29,8 @@ project(acados LANGUAGES C CXX)
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)

set(CMAKE_INSTALL_PREFIX ${ACADOS_INSTALL_DIR})

# Set up build type
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release
@@ -1,8 +1,8 @@
#!/bin/bash -xe

# Install dependencies
sudo add-apt-repository ppa:george-edison55/cmake-3.x
sudo apt-add-repository ppa:octave/stable
# sudo add-apt-repository ppa:george-edison55/cmake-3.x
# sudo apt-add-repository ppa:octave/stable
sudo apt-get update
sudo apt-get install octave liboctave-dev
sudo apt-get install libgsl0-dev liblapack-dev libopenblas-dev libeigen3-dev python3-tk automake libpcre3-dev git cmake python3-dev
@@ -21,7 +21,7 @@ tar -xf casadi-linux-py35-v3.4.0-64bit.tar.gz -C casadi-py35-v3.4.0-64bit
export CASADIPATH=$(pwd)/casadi-py35-v3.4.0-64bit
export PYTHONPATH=$CASADIPATH:$PYTHONPATH
# will not work with custom install dir
export PYTHONPATH=/usr/local/lib:$PYTHONPATH
export PYTHONPATH=~/.local/lib:$PYTHONPATH

wget -q -nc http://files.casadi.org/download/3.4.0/casadi-linux-matlabR2014b-v3.4.0.tar.gz
mkdir -p casadi-matlabR2014b-v3.4.0
@@ -37,7 +37,7 @@ git submodule update --recursive --init
pushd swig
./autogen.sh
./configure --prefix=$(pwd)/swig_install --enable-silent-rules
make
make -j4 -l4
make install > /dev/null # quiet installation
export PATH=$(pwd):$PATH
popd # swig
@@ -46,6 +46,7 @@ popd # external
# Build acados
mkdir -p build
pushd build
cmake -D SWIG_MATLAB=1 -D SWIG_PYTHON=1 ..
sudo make install
cmake -D SWIG_MATLAB=1 -D SWIG_PYTHON=1 -D ACADOS_INSTALL_DIR=~/.local ..
make -j4 -l4
make install
popd # build
@@ -17,7 +17,10 @@ static bool check_model(const casadi::Function &model, model_t model_type, const
size_t &nx, size_t &nu, size_t &nz)
{
/* CHECK inputs */
int ix, iu, ixdot, iz = 0;
int ix = 0;
int iu = 0;
int ixdot = 0;
int iz = 0;
int model_n_in = model.n_in();
if (model_n_in < 1 )
throw std::invalid_argument(

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

0 comments on commit 01b9a06

Please sign in to comment.