CVS commit: pkgsrc/devel/cmake

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Aug 15 20:40:45 UTC 2023

Modified Files:
        pkgsrc/devel/cmake: distinfo
Added Files:
        pkgsrc/devel/cmake/patches: patch-Tests_CMakeLists.txt

Log Message:
cmake: fix build failure when qt6-qtbase is installed


To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.216 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/cmake/patches/patch-Tests_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.215 pkgsrc/devel/cmake/distinfo:1.216
--- pkgsrc/devel/cmake/distinfo:1.215   Sat Aug 12 12:50:12 2023
+++ pkgsrc/devel/cmake/distinfo Tue Aug 15 20:40:44 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.215 2023/08/12 12:50:12 adam Exp $
+$NetBSD: distinfo,v 1.216 2023/08/15 20:40:44 tnn Exp $
 
 BLAKE2s (cmake-3.27.2.tar.gz) = 46e8c5be3b5070fcceb4b77fa22c4256067c105665785136b59c19e9a72efaa1
 SHA512 (cmake-3.27.2.tar.gz) = a5fee6e97c69c525a5679c77f1615dbfde982fdbebb68b137a3fd2adf94a0a09773cc21fdc55936f039c13ebfc20ef852814158685e821a8545fcb314a6115f9
@@ -21,5 +21,6 @@ SHA1 (patch-Source_Checks_cm__cxx17__che
 SHA1 (patch-Source_Modules_CMakeBuildUtilities.cmake) = 7046fb8a0d2aadb81e027d8e2f1a4bccf2bd79cf
 SHA1 (patch-Source_QtDialog_CMakeLists.txt) = 1cefaa7ee6cd09e84d699ea54844ae3811d890f7
 SHA1 (patch-Source_cmSystemTools.cxx) = 31d736e21ce7f03192cf029a8b6419caa6f00a65
+SHA1 (patch-Tests_CMakeLists.txt) = 555e0be38ef92530c7315a87db65dd3004d7744c
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
 SHA1 (patch-bootstrap) = e34f5b888790e766338086b8c3680be79b71ef18

Added files:

Index: pkgsrc/devel/cmake/patches/patch-Tests_CMakeLists.txt
diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Tests_CMakeLists.txt:1.1
--- /dev/null   Tue Aug 15 20:40:45 2023
+++ pkgsrc/devel/cmake/patches/patch-Tests_CMakeLists.txt       Tue Aug 15 20:40:44 2023
@@ -0,0 +1,23 @@
+$NetBSD: patch-Tests_CMakeLists.txt,v 1.1 2023/08/15 20:40:44 tnn Exp $
+
+Don't build Qt test suite. Picks up qt6-qtbase if installed.
+
+--- Tests/CMakeLists.txt.orig  2023-08-10 15:30:44.000000000 +0000
++++ Tests/CMakeLists.txt
+@@ -263,14 +263,14 @@ if(BUILD_TESTING)
+   # Add tests below here.
+ 
+   if(NOT DEFINED CMake_TEST_Qt6)
+-    set(CMake_TEST_Qt6 1)
++    set(CMake_TEST_Qt6 0)
+   endif()
+   if(CMake_TEST_Qt6)
+     find_package(Qt6 COMPONENTS Core Widgets QUIET NO_MODULE)
+   endif()
+ 
+   if(NOT DEFINED CMake_TEST_Qt5)
+-    set(CMake_TEST_Qt5 1)
++    set(CMake_TEST_Qt5 0)
+   endif()
+   if(CMake_TEST_Qt5)
+     find_package(Qt5Widgets QUIET NO_MODULE)