[llvm-core] Conan v2

recipes/llvm-core/all/conanfile.py

@@ -1,9 +1,9 @@
 from conan.errors import ConanInvalidConfiguration
 from conan import ConanFile
 from conan.tools.build import cross_building
+from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
 from conan.tools.files import apply_conandata_patches, chdir, collect_libs, get, load, rename, replace_in_file, rm, rmdir, save
 from conan.tools.scm import Version
-from conans import CMake
 from collections import defaultdict
 import json
 import re
@@ -113,25 +113,25 @@
 
     def _configure_cmake(self):
         cmake = CMake(self)
         cmake.definitions['BUILD_SHARED_LIBS'] = False
         cmake.definitions['CMAKE_SKIP_RPATH'] = True
         cmake.definitions['CMAKE_POSITION_INDEPENDENT_CODE'] = \
             self.options.get_safe('fPIC', default=False) or self.options.shared
 
         if not self.options.shared:
             cmake.definitions['DISABLE_LLVM_LINK_LLVM_DYLIB'] = True
         # cmake.definitions['LLVM_LINK_DYLIB'] = self.options.shared
 
         cmake.definitions['LLVM_TARGET_ARCH'] = 'host'
         cmake.definitions['LLVM_TARGETS_TO_BUILD'] = self.options.targets
         cmake.definitions['LLVM_BUILD_LLVM_DYLIB'] = self.options.shared
         cmake.definitions['LLVM_DYLIB_COMPONENTS'] = self.options.components
         cmake.definitions['LLVM_ENABLE_PIC'] = \
             self.options.get_safe('fPIC', default=False)
 
         if self.settings.compiler == 'Visual Studio':
             build_type = str(self.settings.build_type).upper()
             cmake.definitions['LLVM_USE_CRT_{}'.format(build_type)] = \
                 self.settings.compiler.runtime
 
         cmake.definitions['LLVM_ABI_BREAKING_CHECKS'] = 'WITH_ASSERTS'
@@ -298,7 +298,7 @@
                 elif dep.startswith('-delayload:'):
                     continue
                 elif dep.startswith('LLVM'):
                     components[dep]
                 elif dep in cmake_targets:
                     dep = cmake_targets[dep]
                 elif os.path.exists(dep):
@@ -358,7 +358,7 @@
                     components['LLVMSupport'].append('z')
             components_path = \
                 os.path.join(self.package_folder, 'lib', 'components.json')
             with open(components_path, 'w') as components_file:
                 json.dump(components, components_file, indent=4)
         else:
             suffixes = ['.dylib', '.so']
@@ -379,7 +379,7 @@
 
         components_path = \
             os.path.join(self.package_folder, 'lib', 'components.json')
         with open(components_path, 'r') as components_file:
             components = json.load(components_file)
 
         dependencies = ['ffi', 'z', 'iconv', 'xml2']