Merge from master

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.

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;

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 );