git: 8abb92f49cc0 - main - devel/gammaray: unbreak Qt6 build if both Qt5 and Qt6 are installed (+)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 01 Jul 2025 16:17:58 UTC
The branch main has been updated by fluffy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8abb92f49cc0af03750622fc6c9c078e09d390e3
commit 8abb92f49cc0af03750622fc6c9c078e09d390e3
Author: Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2025-07-01 16:13:47 +0000
Commit: Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2025-07-01 16:13:47 +0000
devel/gammaray: unbreak Qt6 build if both Qt5 and Qt6 are installed (+)
In some conditions if both Qt5 and Qt6 are installed, CMake detects Qt5 as minimal required version instead of Qt6.
Pass QT_VERSION_MAJOR=${_QT_VER} to cmake args to prevent autodetect preffered version and use specified one.
Reported by: bulk -t
---
devel/gammaray/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/devel/gammaray/Makefile b/devel/gammaray/Makefile
index 1b7c12953220..ed33dd672f9d 100644
--- a/devel/gammaray/Makefile
+++ b/devel/gammaray/Makefile
@@ -46,10 +46,11 @@ QT_VERSION=${QT5_VERSION:C/\./_/:C/\..*//}
.else
USES+= gl kde:6 qt:6
USE_GL= gl
-USE_QT+= base positioning shadertools
+USE_QT+= base positioning shadertools tools:build
QT_VERSION=${QT6_VERSION:C/\./_/:C/\..*//}
.endif
+CMAKE_ARGS+= QT_VERSION_MAJOR=${_QT_VER}
CMAKE_ON= STACK_DETAILS_DWARF
CMAKE_OFF= STACK_DETAILS_AUTO_DETECT