[PR PATCH] Add cmake_generator variable

[PR PATCH] Add cmake_generator variable

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]

There is a new pull request by subnut against master on the void-packages repository

https://github.com/subnut/void-packages cmake_generator
https://github.com/void-linux/void-packages/pull/36455

Add cmake_generator variable
## where should the cmake_generator variable be placed?

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36455.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cmake_generator-36455.patch --]
[-- Type: text/x-diff, Size: 10286 bytes --]

From 043320536042c918ed876e41636f72476c2ee3fd Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Fri, 1 Apr 2022 20:19:23 +0530
Subject: [PATCH] Add cmake_generator variable

---
 common/build-style/cmake.sh     | 2 +-
 srcpkgs/Cataclysm-DDA/template  | 2 +-
 srcpkgs/anope/template          | 2 +-
 srcpkgs/arcan/template          | 2 +-
 srcpkgs/fntsample/template      | 2 +-
 srcpkgs/gnuradio-nrsc5/template | 2 +-
 srcpkgs/hedgewars/template      | 2 +-
 srcpkgs/icewm/template          | 2 +-
 srcpkgs/ippusbxd/template       | 2 +-
 srcpkgs/mumble/template         | 2 +-
 srcpkgs/musikcube/template      | 2 +-
 srcpkgs/opencolorio/template    | 2 +-
 srcpkgs/opentoonz/template      | 2 +-
 srcpkgs/stepmania/template      | 2 +-
 srcpkgs/supercollider/template  | 2 +-
 srcpkgs/supertux2/template      | 2 +-
 srcpkgs/sysdig/template         | 2 +-
 srcpkgs/warsow/template         | 2 +-
 srcpkgs/zig/template            | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 33a556be0011..2187c060d1f7 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -62,7 +62,7 @@ _EOF
 
 	cmake_args+=" -DCMAKE_INSTALL_SBINDIR=bin"
 
-	export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
+	export CMAKE_GENERATOR="${cmake_generator:-Ninja}"
 	# Remove -pipe: https://gitlab.kitware.com/cmake/cmake/issues/19590
 	CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \
 		cmake ${cmake_args} ${configure_args} \
diff --git a/srcpkgs/Cataclysm-DDA/template b/srcpkgs/Cataclysm-DDA/template
index bbe66b9f29b9..9cf06bbfc929 100644
--- a/srcpkgs/Cataclysm-DDA/template
+++ b/srcpkgs/Cataclysm-DDA/template
@@ -19,7 +19,7 @@ checksum=b0af9a9292929e17332edcea770bca9a91f1d08ea47726d78a47e09281a42fa3
 build_options="tiles backtrace"
 build_options_default="tiles"
 
-export CMAKE_GENERATOR="Unix Makefiles"
+cmake_generator="Unix Makefiles"
 
 case $XBPS_TARGET_MACHINE in
 	*-musl);;
diff --git a/srcpkgs/anope/template b/srcpkgs/anope/template
index 77b9d4b4f6d1..089ba429bfda 100644
--- a/srcpkgs/anope/template
+++ b/srcpkgs/anope/template
@@ -25,7 +25,7 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	LDFLAGS="-lintl"
 fi
 
-export CMAKE_GENERATOR="Unix Makefiles"
+cmake_generator="Unix Makefiles"
 
 pre_configure() {
 	# prevent cmake from building include/version and running
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index f33db1fadeb8..5d0670753229 100644
--- a/srcpkgs/arcan/template
+++ b/srcpkgs/arcan/template
@@ -28,7 +28,7 @@ distfiles="https://github.com/letoram/${pkgname}/archive/${version}.tar.gz
 checksum="ca8a9b82000eef60970901641be1130b19c51a1cc2a17278e2365ca3e3a13551
  3a50a87c05b67c466a868cc77f8dc7f9cfc9466aeeafcd823daca0d108c504da"
 
-export CMAKE_GENERATOR="Unix Makefiles"
+cmake_generator="Unix Makefiles"
 
 replaces="arcan-wayland>=0"
 
diff --git a/srcpkgs/fntsample/template b/srcpkgs/fntsample/template
index ab1e4ae7eb8a..3602fcd88565 100644
--- a/srcpkgs/fntsample/template
+++ b/srcpkgs/fntsample/template
@@ -16,4 +16,4 @@ changelog="https://raw.githubusercontent.com/eugmes/fntsample/master/ChangeLog"
 distfiles="https://github.com/eugmes/fntsample/archive/release/${version}.tar.gz"
 checksum="e4e8b50b0a5e984cfdaa32b7d133bd3bf0c62edb14f752f7df1190176023972b"
 
-export CMAKE_GENERATOR="Unix Makefiles"
+cmake_generator="Unix Makefiles"
diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template
index f0d91aa1c8d2..3c6bfb1bb985 100644
--- a/srcpkgs/gnuradio-nrsc5/template
+++ b/srcpkgs/gnuradio-nrsc5/template
@@ -15,7 +15,7 @@ homepage="https://github.com/argilo/gr-nrsc5/"
 distfiles="https://github.com/argilo/gr-nrsc5/archive/v${version}.tar.gz"
 checksum=d736c4cb1104254d07296d2a61880e07149c9bfd1a49aed504215672d4e09485
 
-export CMAKE_GENERATOR="Unix Makefiles"
+cmake_generator="Unix Makefiles"
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template
index 7060dbc37d95..5cc0d48a6c8c 100644
--- a/srcpkgs/hedgewars/template
+++ b/srcpkgs/hedgewars/template
@@ -20,7 +20,7 @@ checksum=211634e61f2e4beecc3c98c6f749601fcd08321fda1ba969b3b3832a004f155b
 nopie_files="/usr/bin/hwengine"
 nocross="Needs investigation: fails to link hwengine"
 replaces="hedgewars-data>=0"
-export CMAKE_GENERATOR="Unix Makefiles"
+cmake_generator="Unix Makefiles"
 
 case $XBPS_TARGET_MACHINE in
 	x86_64*|ppc64le|ppc64)
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index f42cb153a7f1..fb78664f8ed2 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -23,7 +23,7 @@ checksum=d1ff3ce7491d857c17ed0dc3dda47ddc5fdeee23ac910fa6c42ca55b7039d541
 make_check=no
 
 # Ninja build files generation fails
-export CMAKE_GENERATOR="Unix Makefiles"
+cmake_generator="Unix Makefiles"
 
 # No c++ warnings for 'One Defintion Rules' and make sure LTO goes ok
 CXXFLAGS="-Wno-odr -fno-strict-aliasing"
diff --git a/srcpkgs/ippusbxd/template b/srcpkgs/ippusbxd/template
index e81064e8b91d..174c86800778 100644
--- a/srcpkgs/ippusbxd/template
+++ b/srcpkgs/ippusbxd/template
@@ -15,7 +15,7 @@ distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=996a572c8f6d1426a58ad3b95c21fea7f5b64d5db34a825c543d7869b3c77891
 conf_files="/etc/apparmor.d/usr.sbin.ippusbxd"
 
-export CMAKE_GENERATOR="Unix Makefiles"
+cmake_generator="Unix Makefiles"
 
 do_install() {
 	vbin build/ippusbxd
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 9c158c6e8efd..93f66488aa7d 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -26,7 +26,7 @@ checksum=b67d82b4e6cc5834b965c5bc25339e456534bbd5b9dda6c8c95cf9cb80e434b0
 build_options="jack portaudio"
 build_options_default="jack portaudio"
 
-export CMAKE_GENERATOR="Unix Makefiles"
+cmake_generator="Unix Makefiles"
 
 post_install() {
 	vbin ${wrksrc}/scripts/murmur-user-wrapper
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index d8d4e73d6b4b..36d0a3ccefc6 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -23,7 +23,7 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-latomic'"
 fi
 
-export CMAKE_GENERATOR="Unix Makefiles"
+cmake_generator="Unix Makefiles"
 
 #XXX: Otherwise xbps-install ffmpeg-devel will complain about unresolving shlibs
 # SDL2-2.0.10_3: broken, unresolvable shlib 'libGL.so.1'
diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template
index 179736598588..4d1d34449d82 100644
--- a/srcpkgs/opencolorio/template
+++ b/srcpkgs/opencolorio/template
@@ -20,7 +20,7 @@ changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/Chang
 distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
 checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
 
-export CMAKE_GENERATOR="Unix Makefiles"
+cmake_generator="Unix Makefiles"
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/opentoonz/template b/srcpkgs/opentoonz/template
index 540a66afc6bc..b08018baf30e 100644
--- a/srcpkgs/opentoonz/template
+++ b/srcpkgs/opentoonz/template
@@ -17,7 +17,7 @@ homepage="https://opentoonz.github.io/e/"
 distfiles="https://github.com/opentoonz/opentoonz/archive/v${version}.tar.gz"
 checksum=fba0f381fb71ffda89e6423b4d461450d4851f93830342e69e36313070af5990
 
-export CMAKE_GENERATOR="Unix Makefiles"
+cmake_generator="Unix Makefiles"
 
 pre_configure() {
 	# Upstream uses their own modified version of tiff
diff --git a/srcpkgs/stepmania/template b/srcpkgs/stepmania/template
index 07afdba93ce6..3fa47a6f42e8 100644
--- a/srcpkgs/stepmania/template
+++ b/srcpkgs/stepmania/template
@@ -20,7 +20,7 @@ checksum=df79bcadd69d4ed60cf560d45386ec275181343495ffd744c3ff8f73c83d4755
 # with Windows
 archs="i686 x86_64"
 
-export CMAKE_GENERATOR="Unix Makefiles"
+cmake_generator="Unix Makefiles"
 
 post_install() {
 	vlicense Docs/Licenses.txt
diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template
index c7a878f91c09..a0e63137d88a 100644
--- a/srcpkgs/supercollider/template
+++ b/srcpkgs/supercollider/template
@@ -19,7 +19,7 @@ homepage="https://github.com/supercollider/supercollider"
 distfiles="https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2"
 checksum=2dd2f8179a55de4735ac940e2e2d0df4e68cc3a33172628e4dd99ae89c74856b
 
-export CMAKE_GENERATOR="Unix Makefiles"
+cmake_generator="Unix Makefiles"
 
 build_options="webengine"
 desc_option_webengine="Build Qt5 WebEngine support"
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 4c39b458dad4..5e56ecb18d62 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -21,4 +21,4 @@ distfiles="https://github.com/SuperTux/supertux/releases/download/v${version}/Su
 checksum=26a9e56ea2d284148849f3239177d777dda5b675a10ab2d76ee65854c91ff598
 replaces="supertux2-data>=0"
 
-export CMAKE_GENERATOR="Unix Makefiles"
+cmake_generator="Unix Makefiles"
diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index e0c59ec03489..f233d96407f7 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -28,7 +28,7 @@ case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args+=" -DMUSL_OPTIMIZED_BUILD=On"
 esac
 
-export CMAKE_GENERATOR="Unix Makefiles"
+cmake_generator="Unix Makefiles"
 
 # Avoid excessive warnings spam to the log
 CXXFLAGS="-Wno-deprecated-declarations"
diff --git a/srcpkgs/warsow/template b/srcpkgs/warsow/template
index 8dad5adb742b..07db7877da83 100644
--- a/srcpkgs/warsow/template
+++ b/srcpkgs/warsow/template
@@ -22,7 +22,7 @@ checksum=99c88bc08f5e6055d28534de6e84fc204026dda51dc31e22caca1977f199453a
 
 archs="i686* x86_64*"
 
-export CMAKE_GENERATOR="Unix Makefiles"
+cmake_generator="Unix Makefiles"
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/zig/template b/srcpkgs/zig/template
index 728c5a64e9df..8aad3a854b3c 100644
--- a/srcpkgs/zig/template
+++ b/srcpkgs/zig/template
@@ -15,7 +15,7 @@ checksum=8c428e14a0a89cb7a15a6768424a37442292858cdb695e2eb503fa3c7bf47f1a
 nopie=yes
 nocross=yes
 
-export CMAKE_GENERATOR="Unix Makefiles"
+cmake_generator="Unix Makefiles"
 
 post_install() {
 	vlicense LICENSE

Re: [ci skip] Add cmake_generator variable

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 382 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/36455#issuecomment-1085998886

Comment:
I don't think this adds any value. `CMAKE_GENERATOR` is already expected by CMake itself. The build style just sets a default if one isn't provided. Why define another variable, adding documentation and an xlint rule, just to copy it over?

Re: [PR PATCH] [Closed]: [RFC][skip ci] Add cmake_generator variable

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1162 bytes --]

There's a closed pull request on the void-packages repository

[RFC][skip ci] Add cmake_generator variable
https://github.com/void-linux/void-packages/pull/36455

Description:
## where should the cmake_generator variable be placed?

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->