Public-Auto-release: v2.17.1

# Changed * Replace c++17 with c++14 call and added test to check compatibility * Bugfix: Builds without Python failed with missing target dependency * Enforce protobuf version 3
Blickfeld · Feb 8, 2021 · 83f8dc6 · 83f8dc6
1 parent 764ac8d
commit 83f8dc6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -135,7 +135,7 @@ set (LIBINCLUDEDIR_TOP "${PROJECT_BINARY_DIR}/include")
 # Protobuf
 set(PROTOBUF_SRC_DIR "${PROJECT_SOURCE_DIR}/thirdparty/protobuf")
 if(BF_USE_SYSTEM_PROTOBUF)
-  find_package(Protobuf REQUIRED)
+  find_package(Protobuf 3.0.0 REQUIRED)
 
   # Check version of protobuf
   if(PROTOBUF_FOUND AND Protobuf_PROTOC_EXECUTABLE)

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -13,6 +13,13 @@ influence the resulting point cloud.
 
 ### Removed
 
+## [2.17.1] - 2021.02.08
+
+### Changed
+* Replace c++17 with c++14 call and added test to check compatibility
+* Bugfix: Builds without Python failed with missing target dependency
+* Enforce protobuf version 3
+
 ## [2.17.0] - 2021.02.05
 
 ### Added

diff --git a/protocol/CMakeLists.txt b/protocol/CMakeLists.txt
@@ -168,8 +168,8 @@ foreach(FILE ${PROTOBUF_SOURCES})
 			DEPENDS ${FILE}
 			WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
 		)
+		list(APPEND PROTOBUF_GENERATED_PY ${PROTOBUF_GENERATED_PY_DIR}/${FILE_PY})
 	endif()
-	list(APPEND PROTOBUF_GENERATED_PY ${PROTOBUF_GENERATED_PY_DIR}/${FILE_PY})
 endforeach()
 
 # NPM Build (moved out of the loop as pbjs and pbts accepts all .proto files at once.)

diff --git a/src/mockup_session.cpp b/src/mockup_session.cpp
@@ -83,7 +83,8 @@ void mockup_session::do_read() {
 }
 
 void mockup_session::do_send() {
-	auto weak_self(weak_from_this());
+	auto self(shared_from_this());
+	auto weak_self = std::weak_ptr<mockup_session>(self);
 
 	send_thread = std::make_shared<asio::thread>([this, weak_self] {
 				while (auto self = weak_self.lock()) {
@@ -114,4 +115,4 @@ void mockup_session::do_send() {
 
 }  // namespace blickfeld
 
-#endif
+#endif