From 1a43c6a750bf4f9e2f065a73b497cd17e955eb72 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 11 Aug 2020 10:38:20 -0500 Subject: [PATCH] CMake fixups for mass change. --- lpcnetfreedv.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lpcnetfreedv.spec b/lpcnetfreedv.spec index 37e26e5..07b763b 100644 --- a/lpcnetfreedv.spec +++ b/lpcnetfreedv.spec @@ -35,9 +35,9 @@ Summary: Development files and tools for LPCNet %build -mkdir build && pushd build # Add model data archive to the build directory so CMake finds it. -cp %{SOURCE1} . +mkdir -p %{_vpath_builddir} +cp %{SOURCE1} %{_vpath_builddir}/ # We need to force optimizations to specific values since the build system and # host system will likely be different. @@ -52,13 +52,12 @@ cp %{SOURCE1} . %global _cpuopt "" %endif -%cmake -DDISABLE_CPU_OPTIMIZATION=TRUE %{_cpuopt} ../ -%make_build +%cmake -DDISABLE_CPU_OPTIMIZATION=TRUE %{_cpuopt} +%cmake_build %install -pushd build -%make_install +%cmake_install %files