Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[submodule "C++/External/blasfeo"]
path = C++/External/blasfeo
url = https://github.com/giaf/blasfeo.git
[submodule "C++/External/hpipm"]
path = C++/External/hpipm
url = https://github.com/giaf/hpipm.git
[submodule "External/matplotlib"]
path = C++/External/matplotlib
url = https://github.com/lava/matplotlib-cpp.git
[submodule "C++/External/Eigen"]
path = C++/External/Eigen
url = https://gitlab.com/libeigen/eigen.git
[submodule "C++/External/Json"]
path = C++/External/Json
url = https://github.com/nlohmann/json.git
2 changes: 1 addition & 1 deletion C++/.gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Project specific excludes
/External/
/MPCC
/build

# CMake
CMakeCache.txt
Expand Down
5 changes: 4 additions & 1 deletion C++/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ include_directories(External/matplotlib)
include_directories(External/Eigen)
include_directories(External/Json/include)

add_subdirectory(External/blasfeo)
add_subdirectory(External/hpipm)

add_executable(MPCC
main.cpp
types.cpp
Expand Down Expand Up @@ -40,4 +43,4 @@ find_package(Python COMPONENTS Development)
target_include_directories(MPCC PRIVATE ${Python_INCLUDE_DIRS})
target_link_libraries(MPCC ${Python_LIBRARIES})

target_link_libraries(MPCC ${CMAKE_SOURCE_DIR}/External/hpipm/lib/lib/libhpipm.a ${CMAKE_SOURCE_DIR}/External/blasfeo/lib/lib/libblasfeo.a m)
target_link_libraries(MPCC hpipm blasfeo m)
1 change: 1 addition & 0 deletions C++/External/Eigen
Submodule Eigen added at f6cf5d
1 change: 1 addition & 0 deletions C++/External/Json
Submodule Json added at 6af826
1 change: 1 addition & 0 deletions C++/External/blasfeo
Submodule blasfeo added at ca9e5a
1 change: 1 addition & 0 deletions C++/External/hpipm
Submodule hpipm added at 569490
1 change: 1 addition & 0 deletions C++/External/matplotlib
Submodule matplotlib added at ef0383
6 changes: 3 additions & 3 deletions C++/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ Currently, only one track and car model is implemented. However, adapting the pa

## Installation

To install all the dependencies run
To download dependencies, either clone with the `--recurse-submodules` flag, or run the following after cloning:
```
./install.sh
git submodule update --init
```
this clones `blasfeo`, `hpipm`, `matplotlip-cpp`, `nlohmann/json`, and `eigen`, from their git repo, and safes them in a folder External. Additionally, it installs `blasfeo` and `hpipm` in the same External folder, thus no admin rights are necessary.
this clones `blasfeo`, `hpipm`, `matplotlip-cpp`, `nlohmann/json`, and `eigen`, from their git repo, and safes them in a folder External. `blasfeo` and `hpipm` are built by cmake while you are building this repository, with no admin permissions needed.

Note that `matplotlib-cpp` does also require `Python-2.7` and `matplotlib`, for more details see (https://github.com/lava/matplotlib-cpp).

Expand Down
56 changes: 0 additions & 56 deletions C++/install.sh

This file was deleted.