From: "cron2 (Code Review)"
Date: Tue, 28 Apr 2026 13:56:36 +0000
In-Reply-To:
References:
Reply-To: gert@...1296..., arne-openvpn@...1227...,
openvpn-devel@lists.sourceforge.net, frank@...2641...
Message-ID: <5269e14c63335228f0ce296d0091b14285bc37d8-HTML@...2715...>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="CHmFOX1AFh4="; charset=UTF-8
Subject: [Openvpn-devel] [S] Change in openvpn[master]: Fix pkgcs11 vcpkg
port installing debug files on release builds
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
To: flichtenheld
Cc: plaisthos , openvpn-devel
--CHmFOX1AFh4=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/16=
40?usp=3Demail )
Change subject: Fix pkgcs11 vcpkg port installing debug files on release bu=
ilds
......................................................................
Fix pkgcs11 vcpkg port installing debug files on release builds
Change-Id: Icfa559d9923d7dacb4b72e47b22688a4225c4708
Signed-off-by: Frank Lichtenheld
Acked-by: Frank Lichtenheld
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1640
Message-Id: <20260428124810.29709-1-gert@...1296...>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36=
762.html
Signed-off-by: Gert Doering
---
M contrib/vcpkg-ports/pkcs11-helper/portfile.cmake
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake b/contrib/vcp=
kg-ports/pkcs11-helper/portfile.cmake
index f5742a4..8186719 100644
--- a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake
+++ b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake
@@ -23,11 +23,14 @@
OPENSSL_HOME=3D${CURRENT_PACKAGES_DIR}/../openssl_${TARGET_TRIPLET}
)
- file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/pkcs11-=
helper.dll.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib RENAME pkcs11-helper=
.lib)
- file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/pkcs11-=
helper.dll.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib RENAME pkcs11-=
helper.lib)
-
- file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/libpkcs=
11-helper-1.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
- file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/libpkcs=
11-helper-1.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+ file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/pkcs1=
1-helper.dll.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib RENAME pkcs11-help=
er.lib)
+ file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/libpk=
cs11-helper-1.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+ endif()
+ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+ file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/pkcs1=
1-helper.dll.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib RENAME pkcs1=
1-helper.lib)
+ file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/libpk=
cs11-helper-1.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+ endif()
set(PACKAGE_VERSION "${VERSION}")
set(libdir [[${prefix}/lib]])
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1640?usp=3Demail
To unsubscribe, or for help writing mail filters, visit http://gerrit.openv=
pn.net/settings?usp=3Demail
Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Icfa559d9923d7dacb4b72e47b22688a4225c4708
Gerrit-Change-Number: 1640
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld
Gerrit-Reviewer: flichtenheld
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
--CHmFOX1AFh4=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
cron2 sub=
mitted this change.
View Change
Fix pkgcs11 vcpkg port installing debug files on=
release builds
Change-Id: Icfa559d9923d7dacb4b72e47b22688a4225c4708=
Signed-off-by: Frank Lichtenheld <frank@...2641...>
Acked-by: =
Frank Lichtenheld <frank@...2641...>
Gerrit URL: https://gerrit.op=
envpn.net/c/openvpn/+/1640
Message-Id: <20260428124810.29709-1-gert@...220...=
..1296...>
URL: https://www.mail-archive.com/openvpn-devel@...1439...=
ceforge.net/msg36762.html
Signed-off-by: Gert Doering <gert@...2132...=
.>
---
M contrib/vcpkg-ports/pkcs11-helper/portfile.cmake
1 fil=
e changed, 8 insertions(+), 5 deletions(-)
diff --git a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake b/contrib/=
vcpkg-ports/pkcs11-helper/portfile.cmake
index f5742a4..818=
6719 100644
--- a/contrib/vcpkg-ports/pkcs11-helper/portfil=
e.cmake
+++ b/contrib/vcpkg-ports/pkcs11-helper/portfile.cm=
ake
@@ -23,11 +23,14 @@
OPENSSL_HO=
ME=3D${CURRENT_PACKAGES_DIR}/../openssl_${TARGET_TRIPLET}
=
)
-=
file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/pkcs11-h=
elper.dll.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib RENAME pkcs11-helper.=
lib)
- file(INSTALL ${=
CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/pkcs11-helper.dll.lib DES=
TINATION ${CURRENT_PACKAGES_DIR}/debug/lib RENAME pkcs11-helper.lib)=
-
- file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET=
_TRIPLET}-rel/lib/libpkcs11-helper-1.dll DESTINATION ${CURRENT_PACKAGES_DIR=
}/bin)
- file(INSTALL =
${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/libpkcs11-helper-1.dll =
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD=
_TYPE STREQUAL "release")
+ file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET=
}-rel/lib/pkcs11-helper.dll.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib REN=
AME pkcs11-helper.lib)
+ file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/lib=
pkcs11-helper-1.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+ endif()
+ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_B=
UILD_TYPE STREQUAL "debug")
+ file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPL=
ET}-dbg/lib/pkcs11-helper.dll.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug=
/lib RENAME pkcs11-helper.lib)
+ file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg=
/lib/libpkcs11-helper-1.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)<=
/span>
+ endif()
=
set(PACKAGE_VERSION "${VERSION}")
set(libdir [[${prefix}/lib]])
To view, visit change 1640. To unsubscribe, or for help writing mail filt=
ers, visit setti=
ngs.
Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Icfa559d9923d7dacb4b72e47b22=
688a4225c4708
Gerrit-Change-Number: 1640
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...=
.>
Gerrit-Reviewer: flichtenheld <frank@...2716...=
1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...=
.1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...=
ts.sourceforge.net>
=
--CHmFOX1AFh4=--