From 477a2c88bee77b78e0538f129af11400949851ed Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 4 Apr 2023 13:07:16 +0300 Subject: [PATCH 1/3] aedi: update module target handling to the current version of cmake `_IMPORT_CHECK_TARGETS` and `_IMPORT_CHECK_FILES_FOR_...` were replaced with `_cmake_import_check_targets` and `_cmake_import_check_files_for_...` in cmake 3.24.0, see https://gitlab.kitware.com/cmake/cmake/-/commit/59cc92085ea7c5a81de7d79946fa97f045adea78 --- aedi/target/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aedi/target/base.py b/aedi/target/base.py index 40ace6dc..3cd2206b 100644 --- a/aedi/target/base.py +++ b/aedi/target/base.py @@ -462,8 +462,8 @@ class CMakeStaticDependencyTarget(CMakeTarget): def keep_module_target(self, state: BuildState, target: str): import_patterns = ( - r'list\s*\(APPEND\s+_IMPORT_CHECK_TARGETS\s+(?P\w+::[\w-]+)[\s)]', - r'list\s*\(APPEND\s+_IMPORT_CHECK_FILES_FOR_(?P\w+::[\w-]+)\s', + r'list\s*\(APPEND\s+_cmake_import_check_targets\s+(?P\w+::[\w-]+)[\s)]', + r'list\s*\(APPEND\s+_cmake_import_check_files_for_(?P\w+::[\w-]+)\s', ) import_regexes = [re.compile(regex, re.IGNORECASE) for regex in import_patterns] From dd7855af15232d417e2880cec9e7c20d6f2e1562 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 4 Apr 2023 13:08:09 +0300 Subject: [PATCH 2/3] aedi: remove executable from fluidsynth targets exported by cmake --- aedi/target/library_tier1.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aedi/target/library_tier1.py b/aedi/target/library_tier1.py index 887f6156..9486199c 100644 --- a/aedi/target/library_tier1.py +++ b/aedi/target/library_tier1.py @@ -113,6 +113,10 @@ class FluidSynthTarget(base.CMakeStaticDependencyTarget): super().configure(state) + def post_build(self, state: BuildState): + super().prepare_source(state) + self.keep_module_target(state, 'FluidSynth::libfluidsynth') + class GettextTarget(base.ConfigureMakeStaticDependencyTarget): def __init__(self, name='gettext'): From 0bc138d41fb4dc9b641369d1e818ad5bc171330a Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 4 Apr 2023 13:08:33 +0300 Subject: [PATCH 3/3] deps: remove executable from fluidsynth targets exported by cmake --- .../lib/cmake/fluidsynth/FluidSynthTargets-release.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/deps/fluidsynth/lib/cmake/fluidsynth/FluidSynthTargets-release.cmake b/deps/fluidsynth/lib/cmake/fluidsynth/FluidSynthTargets-release.cmake index 3d86fc2d..a940dea3 100644 --- a/deps/fluidsynth/lib/cmake/fluidsynth/FluidSynthTargets-release.cmake +++ b/deps/fluidsynth/lib/cmake/fluidsynth/FluidSynthTargets-release.cmake @@ -11,8 +11,6 @@ set_target_properties(FluidSynth::fluidsynth PROPERTIES IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/fluidsynth" ) -list(APPEND _cmake_import_check_targets FluidSynth::fluidsynth ) -list(APPEND _cmake_import_check_files_for_FluidSynth::fluidsynth "${_IMPORT_PREFIX}/bin/fluidsynth" ) # Import target "FluidSynth::libfluidsynth" for configuration "Release" set_property(TARGET FluidSynth::libfluidsynth APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)