Skip to content

Commit 0b1b6fb

Browse files
authored
propagate extern libs settings to package (OpenMS#8556)
1 parent b1b7975 commit 0b1b6fb

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.github/workflows/openms_ci_matrix_full.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,10 @@ jobs:
552552
SIGNING_EMAIL: "apple@openms.de"
553553
# Developer ID Installer certificate identity for signing .pkg (public info, not a secret)
554554
CPACK_PRODUCTBUILD_IDENTITY_NAME: "Developer ID Installer: OpenMS Inc. (C64UCGJ5PL)"
555+
# External library options to prevent file conflicts with system packages
556+
USE_EXTERNAL_JSON: ${{ (startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'windows')) && 'OFF' || 'ON' }}
557+
USE_EXTERNAL_SQLITECPP: ${{ startsWith(matrix.os, 'ubuntu') && 'ON' || 'OFF' }}
558+
USE_EXTERNAL_SIMDE: ${{ startsWith(matrix.os, 'ubuntu') && 'ON' || 'OFF' }}
555559

556560
# Notarize macOS packages for Gatekeeper approval
557561
# This step submits the signed package to Apple for notarization and staples the ticket

tools/ci/cipackage.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set(CTEST_BINARY_DIRECTORY "${CTEST_SOURCE_DIRECTORY}/bld")
1212
set(CTEST_CMAKE_GENERATOR "Ninja")
1313

1414
set(CONFIGURE_OPTIONS)
15-
set(VARS_TO_LOAD PACKAGE_TYPE SEARCH_ENGINES_DIRECTORY SIGNING_IDENTITY SIGNING_EMAIL CPACK_PRODUCTBUILD_IDENTITY_NAME)
15+
set(VARS_TO_LOAD PACKAGE_TYPE SEARCH_ENGINES_DIRECTORY SIGNING_IDENTITY SIGNING_EMAIL CPACK_PRODUCTBUILD_IDENTITY_NAME USE_EXTERNAL_JSON USE_EXTERNAL_SQLITECPP USE_EXTERNAL_SIMDE)
1616
foreach(VAR ${VARS_TO_LOAD})
1717
if(DEFINED ENV{${VAR}})
1818
list(APPEND CONFIGURE_OPTIONS "-D${VAR}=$ENV{${VAR}}")

0 commit comments

Comments
 (0)