diff --git a/CMakeLists.txt b/CMakeLists.txt index 39a54f7726f73d811c9943c759173f2b0499d23e..fb8c20ce9a9bb2133117b68ff774466f02a14106 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,7 @@ find_package( PCL ) #find_package( ZLIB REQUIRED ) set(CMAKE_CXX_STANDARD 17) # For PCL/VTK https://github.com/PointCloudLibrary/pcl/issues/2686 +set(HAVE_OPENCV TRUE) # Readline library is not required on Windows # May also entirely remove dependence on this... it should be optional at least. diff --git a/common/cpp/include/ftl/config.h.in b/common/cpp/include/ftl/config.h.in index b03e4eeeff946c3e8c282500dd4717fa11fd3539..7c128412996648572adbbd5a6a1a625f98ba9fed 100644 --- a/common/cpp/include/ftl/config.h.in +++ b/common/cpp/include/ftl/config.h.in @@ -5,6 +5,7 @@ #cmakedefine HAVE_OPENCVCUDA #cmakedefine HAVE_URIPARSESINGLE #cmakedefine HAVE_CUDA +#cmakedefine HAVE_OPENCV extern const char *FTL_VERSION_LONG; extern const char *FTL_VERSION; diff --git a/net/cpp/test/net_integration.cpp b/net/cpp/test/net_integration.cpp index aa698dbe8668fd7082cba84d26ca4f7b3713c2d7..34f01215a63d2ac371d51854b576a68f875ad454 100644 --- a/net/cpp/test/net_integration.cpp +++ b/net/cpp/test/net_integration.cpp @@ -17,11 +17,12 @@ TEST_CASE("Universe::connect()", "[net]") { Universe b; a.listen("tcp://localhost:7077"); + sleep_for(milliseconds(100)); SECTION("valid tcp connection using ipv4") { REQUIRE( b.connect("tcp://127.0.0.1:7077") ); - sleep_for(milliseconds(100)); + sleep_for(milliseconds(200)); REQUIRE( a.numberOfPeers() == 1 ); REQUIRE( b.numberOfPeers() == 1 ); @@ -30,7 +31,7 @@ TEST_CASE("Universe::connect()", "[net]") { SECTION("valid tcp connection using hostname") { REQUIRE( b.connect("tcp://localhost:7077") ); - sleep_for(milliseconds(100)); + sleep_for(milliseconds(200)); REQUIRE( a.numberOfPeers() == 1 ); REQUIRE( b.numberOfPeers() == 1 );