Skip to content

Commit

Permalink
ci: enable tcadstool build
Browse files Browse the repository at this point in the history
We now link against TcAdsDll from the respective AdsApi package.

Signed-off-by: Fabian Gabriel <F.Gabriel@beckhoff.com>
Reviewed-by: Patrick Bruenn <p.bruenn@beckhoff.com>
  • Loading branch information
Fabian Gabriel authored and pbruenn committed Jul 11, 2023
1 parent e663476 commit f396ba4
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,12 @@ build-clangcl:
tags:
- docker
variables:
BHF_CI_MESON_OPTIONS: '--cross-file meson.cross.clang-cl.win32 -Dcpp_args=["-D_CRT_NONSTDC_NO_WARNINGS=1","-D_CRT_SECURE_NO_WARNINGS=1","-DNOMINMAX=1"]'
BHF_CI_MESON_OPTIONS: '--cross-file meson.cross.clang-cl.win32 -Dcpp_args=["-D_CRT_NONSTDC_NO_WARNINGS=1","-D_CRT_SECURE_NO_WARNINGS=1","-DNOMINMAX=1"] -Dtcadsdll_include=/opt/TcAdsDll/Include -Dtcadsdll_lib=/opt/TcAdsDll/Lib/x64'
before_script:
- tcpkg download TwinCAT.XAE.AdsApi -o _packages -y
- unzip _packages/TwinCAT.XAE.AdsApi.*.nupkg -d _packages/nupkg
- msiextract _packages/nupkg/tools/TwinCAT-XAE-AdsApi.msi -C _packages/msi
- mv _packages/msi/Program\ Files/AdsApi/TcAdsDll /opt/TcAdsDll

build-tcpkg:
stage: build
Expand Down

0 comments on commit f396ba4

Please sign in to comment.