googleapis: use resdirs in components and use shorten cmake target na…

…mes when building
conan-io · Jan 27, 2023 · 4cadd15 · 4cadd15
1 parent 36d7085
commit 4cadd15
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/recipes/googleapis/all/conanfile.py b/recipes/googleapis/all/conanfile.py
@@ -191,11 +191,11 @@ def package_id(self):
         self.info.requires["protobuf"].full_package_mode()
 
     def package_info(self):
-        self.cpp_info.resdirs = ["res"]
         with open(os.path.join(self.package_folder, self._DEPS_FILE), "r", encoding="utf-8") as f:
             for line in f.read().splitlines():
                 (name, libtype, deps) = line.rstrip('\n').split(' ')
                 self.cpp_info.components[name].requires = deps.split(',')
+                self.cpp_info.components[name].resdirs = ["res"]
                 if libtype == 'LIB':
                     self.cpp_info.components[name].libs = [name]
                 self.cpp_info.components[name].names["pkg_config"] = name

diff --git a/recipes/googleapis/all/helpers.py b/recipes/googleapis/all/helpers.py
@@ -41,39 +41,56 @@ def cmake_target(self):
             qname = qname[2:]
         return f'{qname.replace("/", "_")}_{self.name}'
 
+    def shorten_cmake_target(self, cmake_target):
+        short_name = cmake_target
+        prefix = "google_"
+        suffix = "_proto"
+        if cmake_target.startswith(prefix):
+            short_name = short_name[len(prefix):]
+        if short_name.endswith(suffix):
+            short_name = short_name[:-len(suffix)]
+        return short_name
+
     @property
     def cmake_deps(self):
         def to_cmake_target(item):
             if item.startswith("//"):
                 return item[2:].replace("/", "_").replace(":", "_")
             return item
         return [to_cmake_target(it) for it in self.deps]
+
+    @property
+    def cmake_deps_short(self):
+        return [self.shorten_cmake_target(dep) for dep in self.cmake_deps]
 
     @property
     def cmake_content(self):
-        content = f"\n\n# {self.cmake_target}\n"
+        cmake_target_short = self.shorten_cmake_target(self.cmake_target)
+        content = f"\n\n# {self.cmake_target} ({cmake_target_short})\n"
         content += "\n".join([f"#{it}" for it in self.dumps().split('\n')])
         content += "\n"        
         if not self.srcs:
             content += textwrap.dedent(f"""\
-                add_library({self.cmake_target} INTERFACE)
+                add_library({cmake_target_short} INTERFACE)
             """)
         else:
             content += textwrap.dedent(f"""\
-                set({self.cmake_target}_PROTOS {" ".join(["${CMAKE_SOURCE_DIR}/"+it for it in self.srcs])})
-                add_library({self.cmake_target} ${{{self.cmake_target}_PROTOS}})
-                target_include_directories({self.cmake_target} PUBLIC ${{CMAKE_BINARY_DIR}})
-                target_compile_features({self.cmake_target} PUBLIC cxx_std_11)
+                set({cmake_target_short}_PROTOS {" ".join(["${CMAKE_SOURCE_DIR}/"+it for it in self.srcs])})
+                add_library({cmake_target_short} ${{{cmake_target_short}_PROTOS}})
+                target_include_directories({cmake_target_short} PUBLIC ${{CMAKE_BINARY_DIR}})
+                target_compile_features({cmake_target_short} PUBLIC cxx_std_11)
+                # set project_label to shorten the name of the vcxproj file and cause shorter paths
+                set_property(TARGET {cmake_target_short} PROPERTY OUTPUT_NAME "{self.cmake_target}")
                 protobuf_generate(LANGUAGE cpp 
-                                TARGET {self.cmake_target} 
-                                PROTOS ${{{self.cmake_target}_PROTOS}}
+                                TARGET {cmake_target_short} 
+                                PROTOS ${{{cmake_target_short}_PROTOS}}
                                 IMPORT_DIRS ${{CMAKE_SOURCE_DIR}}
                                 )
             """)
 
         if self.deps:
             content += textwrap.dedent(f"""\
-                target_link_libraries({self.cmake_target} {"PUBLIC" if self.srcs else "INTERFACE"} {" ".join(self.cmake_deps)})
+                target_link_libraries({cmake_target_short} {"PUBLIC" if self.srcs else "INTERFACE"} {" ".join(self.cmake_deps_short)})
             """)
 
         return content