From e377a3aa9a8377904afa65c05b6337252cfc16d0 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 31 Dec 2022 10:46:59 +0200 Subject: [PATCH] aedi: use cmake in quasi-glib target --- aedi/target/library_tier1.py | 15 +++------------ patch/quasi-glib/CMakeLists.txt | 5 +++++ patch/{ => quasi-glib}/quasi-glib.cpp | 0 3 files changed, 8 insertions(+), 12 deletions(-) create mode 100644 patch/quasi-glib/CMakeLists.txt rename patch/{ => quasi-glib}/quasi-glib.cpp (100%) diff --git a/aedi/target/library_tier1.py b/aedi/target/library_tier1.py index dc783c19..d275fe8e 100644 --- a/aedi/target/library_tier1.py +++ b/aedi/target/library_tier1.py @@ -507,21 +507,12 @@ class PcreTarget(ConfigureMakeStaticDependencyTarget): self.update_config_script(state.install_path / 'bin/pcre-config') -class QuasiGlibTarget(BuildTarget): +class QuasiGlibTarget(CMakeStaticDependencyTarget): def __init__(self, name='quasi-glib'): super().__init__(name) - def build(self, state: BuildState): - lib_path = state.install_path / 'lib' - os.makedirs(lib_path, exist_ok=True) - - commands = ( - (state.cxx_compiler(), '-std=c++11', '-O3', '-c', state.patch_path / f'{self.name}.cpp'), - (state.host() + '-ar', '-crs', lib_path / f'lib{self.name}.a', f'{self.name}.o'), - ) - - for command in commands: - subprocess.run(command, check=True, cwd=state.build_path, env=state.environment) + def prepare_source(self, state: BuildState): + state.source = state.patch_path / self.name class SndFileTarget(CMakeStaticDependencyTarget): diff --git a/patch/quasi-glib/CMakeLists.txt b/patch/quasi-glib/CMakeLists.txt new file mode 100644 index 00000000..dc3ec4dc --- /dev/null +++ b/patch/quasi-glib/CMakeLists.txt @@ -0,0 +1,5 @@ +cmake_minimum_required(VERSION 3.1) +project(quasi-glib) +add_library(quasi-glib quasi-glib.cpp) +set_property(TARGET quasi-glib PROPERTY CXX_STANDARD 11) +install(TARGETS quasi-glib) diff --git a/patch/quasi-glib.cpp b/patch/quasi-glib/quasi-glib.cpp similarity index 100% rename from patch/quasi-glib.cpp rename to patch/quasi-glib/quasi-glib.cpp