From: "flichtenheld (Code Review)" Date: Tue, 28 Apr 2026 11:49:19 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <22334e3062b2d1edf9b178e2ac646fdc3538d32a-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="dWCwUjJKNMc="; 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: plaisthos Cc: openvpn-devel --dWCwUjJKNMc= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/1640?usp=3Demail to review the following change. 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 --- M contrib/vcpkg-ports/pkcs11-helper/portfile.cmake 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/40/1640/1 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: newchange Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Icfa559d9923d7dacb4b72e47b22688a4225c4708 Gerrit-Change-Number: 1640 Gerrit-PatchSet: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos --dWCwUjJKNMc= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: plaisthos.

flichtenheld would like plaisthos to review this change.

V= iew Change

Fix pkgcs11 vcpkg port installing debug fil=
es on release builds

Change-Id: Icfa559d9923d7dacb4b72e47b22688a4225= c4708
---
M contrib/vcpkg-ports/pkcs11-helper/portfile.cmake
1 fil= e changed, 8 insertions(+), 5 deletions(-)

git p=
ull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/40/1640/1
d= iff --git a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake b/contrib/vcpk= g-ports/pkcs11-helper/portfile.cmake
index f5742a4..8186719= 100644
--- a/contrib/vcpkg-ports/pkcs11-helper/portfile.cm= ake
+++ b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake<= /span>
@@ -23,11 +23,14 @@
OPENSSL_HOME= =3D${CURRENT_PACKAGES_DIR}/../openssl_${TARGET_TRIPLET}
= )

- = file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/pkcs11-hel= per.dll.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib RENAME pkcs11-helper.li= b)
- file(INSTALL ${CU= RRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/pkcs11-helper.dll.lib DESTI= NATION ${CURRENT_PACKAGES_DIR}/debug/lib RENAME pkcs11-helper.lib)-
- file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_T= RIPLET}-rel/lib/libpkcs11-helper-1.dll DESTINATION ${CURRENT_PACKAGES_DIR}/= bin)
- file(INSTALL ${= CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/libpkcs11-helper-1.dll DE= STINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_T= YPE STREQUAL "release")
+ file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-= rel/lib/pkcs11-helper.dll.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib RENAM= E pkcs11-helper.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_BUI= LD_TYPE STREQUAL "debug")
+ file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET= }-dbg/lib/pkcs11-helper.dll.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/l= ib RENAME pkcs11-helper.lib)
+ file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/l= ib/libpkcs11-helper-1.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+ endif()

set(PACKAGE_VERSION "${VERSION}")=
set(libdir [[${prefix}/lib]])

To view, visit change 1640. To unsubscribe, or for help writing mail filter= s, visit setting= s.

Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Icfa559d9923d7dacb4b72e47b22= 688a4225c4708
Gerrit-Change-Number: 1640
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
= --dWCwUjJKNMc=--