Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
Buildbox-Windows
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CGG-public
Containers
Buildbox-Windows
Commits
c6715f78
Commit
c6715f78
authored
2 months ago
by
Martin Heistermann
Browse files
Options
Downloads
Patches
Plain Diff
use standard triplet
parent
250fb96d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#9030
failed
2 months ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+3
-4
3 additions, 4 deletions
Dockerfile
x64-windows-rel.cmake
+0
-4
0 additions, 4 deletions
x64-windows-rel.cmake
with
3 additions
and
8 deletions
Dockerfile
+
3
−
4
View file @
c6715f78
...
...
@@ -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:
...
...
This diff is collapsed.
Click to expand it.
x64-windows-rel.cmake
deleted
100644 → 0
+
0
−
4
View file @
250fb96d
set
(
VCPKG_TARGET_ARCHITECTURE x64
)
set
(
VCPKG_CRT_LINKAGE dynamic
)
set
(
VCPKG_LIBRARY_LINKAGE dynamic
)
set
(
VCPKG_BUILD_TYPE release
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment