From f3b8def1787c9bbd1cbde992b41d08c3e1e89ef7 Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 5 May 2025 00:24:07 -0500 Subject: [PATCH] chore(epsonscan2): Working CMake macro (#4644) * chore(epsonscan2): Working CMake macro, move to system since this contains drivers * fix: Unsure what happened there, average Gilver curse * a * feat: Fully switch to CMake Signed-off-by: Gilver --------- Signed-off-by: Gilver --- anda/{apps => system}/epsonscan2/anda.hcl | 0 anda/{apps => system}/epsonscan2/epsonscan2.spec | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename anda/{apps => system}/epsonscan2/anda.hcl (100%) rename anda/{apps => system}/epsonscan2/epsonscan2.spec (96%) diff --git a/anda/apps/epsonscan2/anda.hcl b/anda/system/epsonscan2/anda.hcl similarity index 100% rename from anda/apps/epsonscan2/anda.hcl rename to anda/system/epsonscan2/anda.hcl diff --git a/anda/apps/epsonscan2/epsonscan2.spec b/anda/system/epsonscan2/epsonscan2.spec similarity index 96% rename from anda/apps/epsonscan2/epsonscan2.spec rename to anda/system/epsonscan2/epsonscan2.spec index 2a88e4cc9b..1a7e6616cf 100644 --- a/anda/apps/epsonscan2/epsonscan2.spec +++ b/anda/system/epsonscan2/epsonscan2.spec @@ -58,15 +58,15 @@ rpm2cpio plugins/*.rpm | cpio -idmv %build # CMake macro fails to generate the build files somehow? This works however. I don't really understand. -cmake . \ +%cmake \ -DBUILD_TYPE=Release -%make_build +%cmake_build %install -%make_install +%cmake_install -# The Makefile fails to do these steps correctly but just using CMake was even more problematic. +# The CMakeLists.txt fails to do these steps correctly. # The file is also very annoying to patch. Thank God this doesn't seem to update anymore. mkdir -p %{buildroot}%{_udevrulesdir} mv %{buildroot}/lib/udev/rules.d/60-%{name}.rules -t %{buildroot}%{_udevrulesdir}