public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/opencv] opencv5: Fix cmake build
@ 2026-08-28 13:31 
  0 siblings, 0 replies; 2+ messages in thread
From:  @ 2026-08-28 13:31 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/opencv
Branch : opencv5
Commit : 5f489979f270e1262b0f8bcadecebc88f8149d52
Author : Sérgio M. Basto <sergio@serjux.com>
Date   : 2020-07-29T01:04:56+01:00
Stats  : +1/-3 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/opencv/c/5f489979f270e1262b0f8bcadecebc88f8149d52?branch=opencv5

Log:
Fix cmake build

---
diff --git a/opencv.spec b/opencv.spec
index 2246b5a..3e1f989 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -361,7 +361,6 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
 # ARGS=-V increases output verbosity
 #ifnarch ppc64
 %if %{with tests}
-pushd build
     cp %SOURCE5 .
     if [ -x /usr/libexec/Xorg ]; then
        Xorg=/usr/libexec/Xorg
@@ -370,8 +369,7 @@ pushd build
     fi
     $Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf -configdir . :99 &
     export DISPLAY=:99
-    LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/build/lib:$LD_LIBARY_PATH make test ARGS=-V || :
-popd
+    LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/build/lib:$LD_LIBARY_PATH %ctest || :
 %endif
 #endif
 

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [rpms/opencv] opencv5: Fix cmake build
@ 2026-08-28 13:31 
  0 siblings, 0 replies; 2+ messages in thread
From:  @ 2026-08-28 13:31 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/opencv
Branch : opencv5
Commit : fb2c54e4ff925f63417cfe9ea0b65e4f431fef2b
Author : Sérgio M. Basto <sergio@serjux.com>
Date   : 2020-07-28T23:40:37+01:00
Stats  : +4/-9 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/opencv/c/fb2c54e4ff925f63417cfe9ea0b65e4f431fef2b?branch=opencv5

Log:
Fix cmake build

---
diff --git a/opencv.spec b/opencv.spec
index e919ae0..2246b5a 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -278,11 +278,9 @@ install -pm 0644 %{SOURCE4} .cache/ade/
 # enabled by default if libraries are presents at build time:
 # GTK, GSTREAMER, 1394, V4L, eigen3
 # non available on Fedora: FFMPEG, XINE
-mkdir -p build
-pushd build
 # disabling IPP because it is closed source library from intel
 
-%cmake CMAKE_VERBOSE=1 \
+%cmake \
  -DCV_TRACE=OFF \
  -DWITH_IPP=OFF \
  -DWITH_ITT=OFF \
@@ -326,7 +324,7 @@ pushd build
 %{?with_opencl: -DOPENCL_INCLUDE_DIR=%{_includedir}/CL } \
 %{!?with_opencl: -DWITH_OPENCL=OFF } \
  -DOPENCV_SKIP_PYTHON_LOADER=ON \
- -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-%{version}/modules \
+ -DOPENCV_EXTRA_MODULES_PATH=opencv_contrib-%{version}/modules \
  -DWITH_LIBV4L=ON \
  -DWITH_OPENMP=ON \
  -DOPENCV_CONFIG_INSTALL_PATH=%{_lib}/cmake/OpenCV \
@@ -337,16 +335,13 @@ pushd build
  %{?with_clp: -DWITH_CLP=ON } \
  %{?with_va: -DWITH_VA=ON } \
  %{!?with_vtk: -DWITH_VTK=OFF} \
- %{?with_vulkan: -DWITH_VULKAN=ON -DVULKAN_INCLUDE_DIRS=%{_includedir}/vulkan } \
- ..
+ %{?with_vulkan: -DWITH_VULKAN=ON -DVULKAN_INCLUDE_DIRS=%{_includedir}/vulkan }
 
 %cmake_build
 
-popd
-
 
 %install
-%make_install -C build
+%cmake_install
 
 rm -rf %{buildroot}%{_datadir}/OpenCV/licenses/
 %if %{with java}

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-08-28 13:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-28 13:31 [rpms/opencv] opencv5: Fix cmake build 
  -- strict thread matches above, loose matches on Subject: below --
2026-08-28 13:31 

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox