Revert "Revert "Merge branch 'fix/bullseye' into feature/rhel""

This reverts commit 3114653.
kroshu · Jan 31, 2024 · 7466f56 · 7466f56
1 parent 1975de3
commit 7466f56
Show file tree

Hide file tree

Showing 3 changed files with 789 additions and 2 deletions.
diff --git a/kuka-external-control-sdk/CMakeLists.txt b/kuka-external-control-sdk/CMakeLists.txt
@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.13)
 
 project("external-control-sdk")
 
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindProtobuf.cmake)
+
+
 set(artifact_name ${PROJECT_NAME})
 
 set(common_directory "common")
@@ -13,7 +16,6 @@ set(target_name "kuka-external-control-sdk")
 set(CMAKE_INSTALL_INCLUDEDIR "/usr/include")
 
 find_package(OpenSSL REQUIRED)
-find_package(Protobuf REQUIRED)
 find_package(PkgConfig REQUIRED)
 
 pkg_check_modules(gRPC REQUIRED grpc++)
@@ -79,7 +81,7 @@ target_include_directories(${target_name} PUBLIC
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${iiqka_directory}/include>"
   "${CMAKE_CURRENT_BINARY_DIR}"
 )
-target_compile_options(${target_name} PRIVATE -g)
+
 target_compile_features(${target_name} INTERFACE cxx_std_17 PRIVATE cxx_std_17)
 
 # Install and export