Add nanopb as an external submodule

awawa-dev · Jun 17, 2024 · 7dbce97 · 7dbce97
1 parent e923a89
commit 7dbce97
Show file tree

Hide file tree

Showing 20 changed files with 46 additions and 4,418 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "external/sdbus-cpp"]
 	path = external/sdbus-cpp
 	url = https://github.com/Kistler-Group/sdbus-cpp
+[submodule "external/nanopb"]
+	path = external/nanopb
+	url = https://github.com/nanopb/nanopb.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -647,8 +647,8 @@ add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_D
 include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/packages.cmake)
 
 # external targets
-if (WIN32 AND TARGET flatbuffers AND TARGET lunasvg AND TARGET flatc AND TARGET qmqtt AND TARGET liblzma AND TARGET sqlite3)
-	set_target_properties(qmqtt flatbuffers lunasvg flatc resources uninstall liblzma sqlite3 PROPERTIES FOLDER ExternalLibsTargets)	
+if (WIN32 AND TARGET flatbuffers AND TARGET protobuf-nanopb AND TARGET lunasvg AND TARGET flatc AND TARGET qmqtt AND TARGET liblzma AND TARGET sqlite3)
+	set_target_properties(qmqtt flatbuffers protobuf-nanopb lunasvg flatc resources uninstall liblzma sqlite3 PROPERTIES FOLDER ExternalLibsTargets)	
 else()
 	set_target_properties(resources uninstall PROPERTIES FOLDER ExternalLibsTargets)
 endif()

diff --git a/cmake/installers.cmake b/cmake/installers.cmake
@@ -212,9 +212,9 @@ macro(DeployUnix TARGET)
 		# HyperHDR bin & res
 		install ( TARGETS hyperhdr DESTINATION "share/hyperhdr/bin" COMPONENT "HyperHDR" )
 		install ( DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/linux/service DESTINATION "share/hyperhdr/" COMPONENT "HyperHDR" )
-		install ( FILES ${CMAKE_SOURCE_DIR}/cmake/resources/hyperhdr-icon-32px.png DESTINATION "share/hyperhdr/icons" COMPONENT "HyperHDR" )
-		install ( FILES ${CMAKE_SOURCE_DIR}/cmake/resources/hyperhdr_128.png DESTINATION "share/hyperhdr/desktop" COMPONENT "HyperHDR" )
-		install ( FILES ${CMAKE_SOURCE_DIR}/cmake/resources/hyperhdr.desktop DESTINATION "share/hyperhdr/desktop" COMPONENT "HyperHDR" )
+		install ( FILES ${CMAKE_SOURCE_DIR}/cmake/linux/resources/hyperhdr-icon-32px.png DESTINATION "share/hyperhdr/icons" COMPONENT "HyperHDR" )
+		install ( FILES ${CMAKE_SOURCE_DIR}/cmake/linux/resources/hyperhdr_128.png DESTINATION "share/hyperhdr/desktop" COMPONENT "HyperHDR" )
+		install ( FILES ${CMAKE_SOURCE_DIR}/cmake/linux/resources/hyperhdr.desktop DESTINATION "share/hyperhdr/desktop" COMPONENT "HyperHDR" )
 
 
 		# Our and custom libs

diff --git a/cmake/resources/hyperhdr-icon-32px.png → cmake/linux/resources/hyperhdr-icon-32px.png b/cmake/resources/hyperhdr-icon-32px.png → cmake/linux/resources/hyperhdr-icon-32px.png
diff --git a/cmake/resources/hyperhdr.desktop → cmake/linux/resources/hyperhdr.desktop b/cmake/resources/hyperhdr.desktop → cmake/linux/resources/hyperhdr.desktop
diff --git a/cmake/resources/hyperhdr_128.png → cmake/linux/resources/hyperhdr_128.png b/cmake/resources/hyperhdr_128.png → cmake/linux/resources/hyperhdr_128.png
diff --git a/cmake/packages.cmake b/cmake/packages.cmake
@@ -60,7 +60,7 @@ SET ( CPACK_PACKAGE_CONTACT "see_me_at@hyperhdr.eu")
 SET ( CPACK_PACKAGE_VENDOR "HyperHDR")
 SET ( CPACK_PACKAGE_EXECUTABLES "hyperhdr;HyperHDR" )
 SET ( CPACK_PACKAGE_INSTALL_DIRECTORY "HyperHDR" )
-SET ( CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/resources/hyperhdr-icon-32px.png")
+SET ( CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/linux/resources/hyperhdr-icon-32px.png")
 
 SET ( CPACK_PACKAGE_VERSION_MAJOR "${HYPERHDR_VERSION_MAJOR}")
 SET ( CPACK_PACKAGE_VERSION_MINOR "${HYPERHDR_VERSION_MINOR}")

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -43,6 +43,28 @@ target_compile_definitions(sqlite3 PUBLIC
 	SQLITE_OMIT_DEPRECATED
 )
 
+#=============================================================================
+# Protobuf-nanopb
+#=============================================================================
+
+set(PROTOBUF-NANOPB-SOURCES
+		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb.h
+		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_common.h
+		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_common.c
+		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_encode.h
+		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_encode.c
+		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_decode.h
+		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_decode.c)
+
+add_library(protobuf-nanopb STATIC ${PROTOBUF-NANOPB-SOURCES})
+set_target_properties(protobuf-nanopb PROPERTIES OUTPUT_NAME protobuf-nanopb)
+install(TARGETS protobuf-nanopb EXPORT nanopb-targets
+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+target_include_directories(protobuf-nanopb INTERFACE
+	$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/nanopb>
+	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+
 #=============================================================================
 # RPi ws281x
 #=============================================================================

diff --git a/external/nanopb b/external/nanopb
diff --git a/include/proto-nano-server/message.pb.h b/include/proto-nano-server/message.pb.h
@@ -3,7 +3,7 @@
 
 #ifndef PB_PROTO_MESSAGE_PB_H_INCLUDED
 #define PB_PROTO_MESSAGE_PB_H_INCLUDED
-#include <pb.h>
+#include <nanopb/pb.h>
 
 #if PB_PROTO_HEADER_VERSION != 40
 #error Regenerate this file with the current version of nanopb generator.