Filter libraries that are not installed out of CMake exports (currently

[oota-llvm.git] / utils / llvm-build / llvmbuild / main.py

diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py
index 6a2da754c3b55f8e24e929b6f40de365f307a6ff..78bd7967ad01010ba040303373930c4f4e511041 100644 (file)
--- a/utils/llvm-build/llvmbuild/main.py
+++ b/utils/llvm-build/llvmbuild/main.py
@@ -503,7 +503,8 @@ subdirectories = %s
 
     def foreach_cmake_library(self, f,
                               enabled_optional_components,
-                              skip_disabled):
+                              skip_disabled,
+                              skip_not_installed):
         for ci in self.ordered_component_infos:
             # Skip optional components which are not enabled.
             if ci.type_name == 'OptionalLibrary' \
@@ -520,6 +521,10 @@ subdirectories = %s
                 if tg and not tg.enabled:
                     continue
 
+            # Skip targets that will not be installed
+            if skip_not_installed and not ci.installed:
+                continue
+
             f(ci)
 
 
@@ -600,7 +605,8 @@ set_property(GLOBAL PROPERTY LLVMBUILD_LIB_DEPS_%s %s)\n""" % (
                      for dep in self.get_required_libraries_for_component(ci)))))
             ,
             enabled_optional_components,
-            skip_disabled = False
+            skip_disabled = False,
+            skip_not_installed = False # Dependency info must be emitted for internals libs too
             )
 
         f.close()
@@ -635,7 +641,8 @@ set_property(TARGET %s PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES %s)\n""" % (
                      for dep in self.get_required_libraries_for_component(ci)))))
             ,
             enabled_optional_components,
-            skip_disabled = True
+            skip_disabled = True,
+            skip_not_installed = True # Do not export internal libraries like gtest
             )
 
         f.close()
@@ -715,10 +722,10 @@ LLVM_LIBS_TO_EXPORT :=""")
                 f.write(' \\\n  %s' % ci.get_prefixed_library_name())
             ,
             enabled_optional_components,
-            skip_disabled = True
+            skip_disabled = True,
+            skip_not_installed = True # Do not export internal libraries like gtest
             )
         f.write('\n')
-
         f.close()
 
 def add_magic_target_components(parser, project, opts):