From c6715f78fb39ec6d68ce3fc15b63fd19904723d1 Mon Sep 17 00:00:00 2001 From: Martin Heistermann <git@mheistermann.de> Date: Fri, 14 Feb 2025 16:57:25 +0100 Subject: [PATCH] use standard triplet --- Dockerfile | 7 +++---- x64-windows-rel.cmake | 4 ---- 2 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 x64-windows-rel.cmake diff --git a/Dockerfile b/Dockerfile index 3a49c02..f70fbb0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -74,6 +74,7 @@ ARG PLATFORM=x64 # based on https://github.com/PointCloudLibrary/pcl/blob/c1757b554db314699620612ba2e27c0c12141740/.dev/docker/windows/Dockerfile #COPY $PLATFORM'-windows-rel.cmake' 'c:\vcpkg\triplets\'$PLATFORM'-windows-rel.cmake' +#ENV VCPKG_DEFAULT_TRIPLET "x64-windows-release" #SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] RUN where vcpkg RUN vcpkg integrate install @@ -85,14 +86,12 @@ RUN vcpkg install ` suitesparse-spqr ` pkgconf ` yasm-tool:x86-windows ` - --triplet $Env:PLATFORM-windows-release --host-triplet $Env:PLATFORM-windows-release --clean-after-build + --clean-after-build #metis #coin-or-ipopt -#RUN vcpkg install ` -# cgal ` -# --triplet $Env:PLATFORM-windows-rel --host-triplet $Env:PLATFORM-windows-rel --clean-after-build +RUN vcpkg install ipopt --clean-after-build # This is for later use in containers, cache does not exist here. # Therefore, only set this after we're done with vcpkg: diff --git a/x64-windows-rel.cmake b/x64-windows-rel.cmake deleted file mode 100644 index f6c4025..0000000 --- a/x64-windows-rel.cmake +++ /dev/null @@ -1,4 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_BUILD_TYPE release) -- GitLab