Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
docker
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
bioroboticslab
robofish
docker
Commits
682ca64f
Commit
682ca64f
authored
5 years ago
by
calrama
Browse files
Options
Downloads
Patches
Plain Diff
windows: Make cmake use vcpkg toolchain file by default
parent
8ceb9f5a
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
windows1809/base/Dockerfile
+1
-0
1 addition, 0 deletions
windows1809/base/Dockerfile
windows1809/base/powershell/vcpkg-cmake.ps1
+11
-0
11 additions, 0 deletions
windows1809/base/powershell/vcpkg-cmake.ps1
with
12 additions
and
0 deletions
windows1809/base/Dockerfile
+
1
−
0
View file @
682ca64f
...
@@ -47,3 +47,4 @@ RUN $vcpkg_dir = 'C:/vcpkg'; \
...
@@ -47,3 +47,4 @@ RUN $vcpkg_dir = 'C:/vcpkg'; \
git checkout c05eb1ab83ddb9d4799fb9f3cd10bb385f05469b
;
\
git checkout c05eb1ab83ddb9d4799fb9f3cd10bb385f05469b
;
\
./scripts/bootstrap.ps1
;
\
./scripts/bootstrap.ps1
;
\
[
Environment]::SetEnvironmentVariable
(
'VCPKG_DIR'
,
"
\"
$vcpkg_dir
\"
"
,
[
EnvironmentVariableTarget]::Machine
)
;
[
Environment]::SetEnvironmentVariable
(
'VCPKG_DIR'
,
"
\"
$vcpkg_dir
\"
"
,
[
EnvironmentVariableTarget]::Machine
)
;
ADD
powershell/vcpkg-cmake.ps1 /Windows/System32/WindowsPowerShell/v1.0/profile.d/vcpkg-cmake.ps1
This diff is collapsed.
Click to expand it.
windows1809/base/powershell/vcpkg-cmake.ps1
0 → 100644
+
11
−
0
View file @
682ca64f
# SPDX-License-Identifier: MIT
#
# Executes CMake with vcpkg toolchain file
#
function
vcpkg-cmake
{
Must-Run
"Program Files/CMake/bin/cmake.exe"
'-DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake'
}
# Use vcpkg-cmake by default
Set-Alias
-Name
cmake
-Value
vcpkg-cmake
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