Merge changes 1870 and 1923
Change-Id: I259729999f5935368b05a9310535c6f294a5c7db
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d3789e..8de23df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@
find_package(docopt REQUIRED)
find_package(Boost REQUIRED)
-find_library(REPLXX_LIBRARY replxx REQUIRED)
+find_library(REPLXX_LIBRARY NAMES replxx replxx-d REQUIRED)
find_path(REPLXX_PATH replxx.hxx)
if("${REPLXX_PATH}" STREQUAL REPLXX_PATH-NOTFOUND)
message(FATAL_ERROR "Cannot find the \"replxx.hxx\" include file for the replxx library.")
diff --git a/src/main.cpp b/src/main.cpp
index 354114f..f702cb8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -42,7 +42,7 @@
std::stringstream stream;
auto completionsSet = parser.completeCommand(input, stream);
- std::vector<std::string> res;
+ std::vector<replxx::Replxx::Completion> res;
std::transform(completionsSet.begin(), completionsSet.end(), std::back_inserter(res),
[input](auto it) { return it; });
return res;
diff --git a/submodules/dependencies b/submodules/dependencies
index 512c7bc..8ee76c5 160000
--- a/submodules/dependencies
+++ b/submodules/dependencies
@@ -1 +1 @@
-Subproject commit 512c7bcd2c0cb9d31ef5e22288d60aa426863329
+Subproject commit 8ee76c5204806f1e0298496015e2f49f7752003e