Received: by mail.netbsd.org (Postfix, from userid 605) id 91E2784DCE; Thu, 2 Jul 2020 20:43:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1B36084D45 for ; Thu, 2 Jul 2020 20:43:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id YyjuZOKOZn_I for ; Thu, 2 Jul 2020 20:43:26 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7674F84C6C for ; Thu, 2 Jul 2020 20:43:26 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6F014FB28; Thu, 2 Jul 2020 20:43:26 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1593722606258040" MIME-Version: 1.0 Date: Thu, 2 Jul 2020 20:43:26 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/lang/lua To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200702204326.6F014FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1593722606258040 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Thu Jul 2 20:43:26 UTC 2020 Modified Files: pkgsrc/lang/lua: luaversion.mk Log Message: lua: cmake support in luaversion.mk To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/lua/luaversion.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1593722606258040 Content-Disposition: inline Content-Length: 953 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/lua/luaversion.mk diff -u pkgsrc/lang/lua/luaversion.mk:1.12 pkgsrc/lang/lua/luaversion.mk:1.13 --- pkgsrc/lang/lua/luaversion.mk:1.12 Tue Jun 30 14:45:05 2020 +++ pkgsrc/lang/lua/luaversion.mk Thu Jul 2 20:43:26 2020 @@ -1,4 +1,4 @@ -# $NetBSD: luaversion.mk,v 1.12 2020/06/30 14:45:05 nia Exp $ +# $NetBSD: luaversion.mk,v 1.13 2020/07/02 20:43:26 nia Exp $ # This file determins which Lua version is used as a dependency for # a package. @@ -164,4 +164,12 @@ LUA_INCDIR= include/lua-${_LUA_DOT_VERS LUA_INTERPRETER= ${LOCALBASE}/bin/lua${_LUA_DOT_VERSION} LUA_COMPILER= ${LOCALBASE}/bin/luac${_LUA_DOT_VERSION} +.if defined(USE_CMAKE) +# used by FindLua.cmake +CMAKE_ARGS+= -DLua_FIND_VERSION_EXACT=ON +CMAKE_ARGS+= -DLua_FIND_VERSION_COUNT=2 +CMAKE_ARGS+= -DLua_FIND_VERSION_MAJOR=${LUA_VERSION_MAJOR} +CMAKE_ARGS+= -DLua_FIND_VERSION_MINOR=${LUA_VERSION_MINOR} +.endif + .endif # LUA_LUAVERSION_MK --_----------=_1593722606258040--