From fd1b3daaa5f4c7af0438a906ceb997a6b894f8f7 Mon Sep 17 00:00:00 2001 From: Alex Kleeman Date: Thu, 11 Mar 2021 11:27:35 -0800 Subject: [PATCH] Add nlopt submodule. (#271) --- .gitmodules | 3 +++ .travis.yml | 2 -- CMakeLists.txt | 1 + tests/test_tune.cc | 1 + third_party/nlopt | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) create mode 160000 third_party/nlopt diff --git a/.gitmodules b/.gitmodules index 592fbde9..b3e311c1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "third_party/variant"] path = third_party/variant url = https://github.com/swift-nav/variant.git +[submodule "third_party/nlopt"] + path = third_party/nlopt + url = https://github.com/swift-nav/nlopt.git diff --git a/.travis.yml b/.travis.yml index d50a92b1..16c6d9d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,6 @@ matrix: - clang-6.0 - clang-format-6.0 - clang-tidy-6.0 - - libnlopt-dev env: - C_COMPILER=gcc-6 CXX_COMPILER=g++-6 - compiler: clang-6.0 @@ -46,7 +45,6 @@ matrix: - clang-6.0 - clang-format-6.0 - clang-tidy-6.0 - - libnlopt-dev env: - C_COMPILER=clang-6.0 CXX_COMPILER=clang++-6.0 - compiler: sphinx diff --git a/CMakeLists.txt b/CMakeLists.txt index f56fa13d..20f803ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,7 @@ find_package(Eigen REQUIRED) find_package(FastCSV REQUIRED) find_package(Gzip-Hpp REQUIRED) find_package(Variant REQUIRED) +find_package(Nlopt REQUIRED) add_library(albatross INTERFACE) target_include_directories(albatross INTERFACE diff --git a/tests/test_tune.cc b/tests/test_tune.cc index 21c69301..8d2aa39f 100644 --- a/tests/test_tune.cc +++ b/tests/test_tune.cc @@ -13,6 +13,7 @@ #include "test_models.h" #include #include +#include namespace albatross { diff --git a/third_party/nlopt b/third_party/nlopt new file mode 160000 index 00000000..5351d0fb --- /dev/null +++ b/third_party/nlopt @@ -0,0 +1 @@ +Subproject commit 5351d0fbc8ca2a7418a77200c4408ff80fd8eaa1