intermediate changes

ref:e8092279aeb152c7934ef72249a90434dbbe4318

6 files changed, 24 insertions, 30 deletions

diff --git a/contrib/tools/protoc/bin/CMakeLists.darwin.txt b/contrib/tools/protoc/bin/CMakeLists.darwin.txt
index 00c5ae2afa..81fe0970e1 100644
--- a/contrib/tools/protoc/bin/CMakeLists.darwin.txt
+++ b/contrib/tools/protoc/bin/CMakeLists.darwin.txt
@@ -14,14 +14,13 @@ target_link_libraries(protoc PUBLIC
   library-cpp-cpuid_check
   contrib-libs-protoc
 )
-target_sources(protoc PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protoc/src/google/protobuf/compiler/main.cc
-)
-target_link_flags(protoc
-  PUBLIC
+target_link_options(protoc PRIVATE
   -Wl,-no_deduplicate
   -Wl,-sdk_version,10.15
   -fPIC
   -fPIC
 )
+target_sources(protoc PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protoc/src/google/protobuf/compiler/main.cc
+)
 vcs_info(protoc)
diff --git a/contrib/tools/protoc/bin/CMakeLists.linux.txt b/contrib/tools/protoc/bin/CMakeLists.linux.txt
index d0e1886d1e..59419fb969 100644
--- a/contrib/tools/protoc/bin/CMakeLists.linux.txt
+++ b/contrib/tools/protoc/bin/CMakeLists.linux.txt
@@ -15,11 +15,7 @@ target_link_libraries(protoc PUBLIC
   library-cpp-cpuid_check
   contrib-libs-protoc
 )
-target_sources(protoc PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/libs/protoc/src/google/protobuf/compiler/main.cc
-)
-target_link_flags(protoc
-  PUBLIC
+target_link_options(protoc PRIVATE
   -ldl
   -lrt
   -Wl,--no-as-needed
@@ -29,4 +25,7 @@ target_link_flags(protoc
   -lrt
   -ldl
 )
+target_sources(protoc PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/libs/protoc/src/google/protobuf/compiler/main.cc
+)
 vcs_info(protoc)
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin.txt b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin.txt
index c86c30114f..3f6b3edfd3 100644
--- a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin.txt
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.darwin.txt
@@ -14,14 +14,13 @@ target_link_libraries(cpp_styleguide PUBLIC
   library-cpp-cpuid_check
   contrib-libs-protoc
 )
-target_sources(cpp_styleguide PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
-)
-target_link_flags(cpp_styleguide
-  PUBLIC
+target_link_options(cpp_styleguide PRIVATE
   -Wl,-no_deduplicate
   -Wl,-sdk_version,10.15
   -fPIC
   -fPIC
 )
+target_sources(cpp_styleguide PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
+)
 vcs_info(cpp_styleguide)
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux.txt b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux.txt
index f7cbff28a2..84ec725be3 100644
--- a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux.txt
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.linux.txt
@@ -15,11 +15,7 @@ target_link_libraries(cpp_styleguide PUBLIC
   library-cpp-cpuid_check
   contrib-libs-protoc
 )
-target_sources(cpp_styleguide PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
-)
-target_link_flags(cpp_styleguide
-  PUBLIC
+target_link_options(cpp_styleguide PRIVATE
   -ldl
   -lrt
   -Wl,--no-as-needed
@@ -29,4 +25,7 @@ target_link_flags(cpp_styleguide
   -lrt
   -ldl
 )
+target_sources(cpp_styleguide PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/tools/protoc/plugins/cpp_styleguide/cpp_styleguide.cpp
+)
 vcs_info(cpp_styleguide)
diff --git a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.darwin.txt b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.darwin.txt
index 9af28345e4..340c4a561e 100644
--- a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.darwin.txt
+++ b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.darwin.txt
@@ -21,14 +21,13 @@ target_link_libraries(grpc_cpp PUBLIC
   library-cpp-cpuid_check
   src-compiler-grpc_plugin_support
 )
-target_sources(grpc_cpp PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/libs/grpc/src/compiler/cpp_plugin.cc
-)
-target_link_flags(grpc_cpp
-  PUBLIC
+target_link_options(grpc_cpp PRIVATE
   -Wl,-no_deduplicate
   -Wl,-sdk_version,10.15
   -fPIC
   -fPIC
 )
+target_sources(grpc_cpp PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/libs/grpc/src/compiler/cpp_plugin.cc
+)
 vcs_info(grpc_cpp)
diff --git a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.linux.txt b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.linux.txt
index ea5b708509..e93850280e 100644
--- a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.linux.txt
+++ b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.linux.txt
@@ -22,11 +22,7 @@ target_link_libraries(grpc_cpp PUBLIC
   library-cpp-cpuid_check
   src-compiler-grpc_plugin_support
 )
-target_sources(grpc_cpp PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/libs/grpc/src/compiler/cpp_plugin.cc
-)
-target_link_flags(grpc_cpp
-  PUBLIC
+target_link_options(grpc_cpp PRIVATE
   -ldl
   -lrt
   -Wl,--no-as-needed
@@ -36,4 +32,7 @@ target_link_flags(grpc_cpp
   -lrt
   -ldl
 )
+target_sources(grpc_cpp PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/libs/grpc/src/compiler/cpp_plugin.cc
+)
 vcs_info(grpc_cpp)