zdoom/zdoom-macos-deps
0
0
Fork 0
mirror of https://github.com/ZDoom/zdoom-macos-deps.git synced 2024-11-25 05:11:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

aedi: support explicit module paths to keep cmake targets

Browse source
This commit is contained in:
alexey.lysiuk 2023-07-20 12:10:14 +03:00
parent 2d47d70110
commit 703b33e6ae
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
aedi/target/base.py
View file

@ -460,7 +460,7 @@ class CMakeStaticDependencyTarget(CMakeTarget):
def post_build(self, state: BuildState): def post_build(self, state: BuildState):
self.install(state) self.install(state)
def keep_module_target(self, state: BuildState, target: str): def keep_module_target(self, state: BuildState, target: str, module_paths: typing.Sequence[Path] = ()):
import_patterns = ( import_patterns = (
r'list\s*\(APPEND\s+_cmake_import_check_targets\s+(?P<target>[\w:-]+)[\s)]', r'list\s*\(APPEND\s+_cmake_import_check_targets\s+(?P<target>[\w:-]+)[\s)]',
r'list\s*\(APPEND\s+_cmake_import_check_files_for_(?P<target>[\w:-]+)\s', r'list\s*\(APPEND\s+_cmake_import_check_files_for_(?P<target>[\w:-]+)\s',
@ -476,12 +476,19 @@ class CMakeStaticDependencyTarget(CMakeTarget):
return line return line
module = 'targets-release.cmake' probe_modules = False
for probe_module in (module, self.name + module): if not module_paths:
module_path = state.install_path / 'lib' / 'cmake' / self.name / probe_module default_modules_path = state.install_path / 'lib' / 'cmake' / self.name
default_module_name = 'targets-release.cmake'
module_paths = (
default_modules_path / default_module_name,
default_modules_path / (self.name + default_module_name)
)
probe_modules = True
if module_path.exists(): for module_path in module_paths:
if not probe_modules or module_path.exists():
self.update_text_file(module_path, _keep_target) self.update_text_file(module_path, _keep_target)