Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
vision
Commits
463cdeab
Unverified
Commit
463cdeab
authored
Jun 22, 2023
by
Radek Bartoň
Committed by
GitHub
Jun 22, 2023
Browse files
CMake build using VS2022 (#7694)
Co-authored-by:
Andrey Talman
<
atalman@fb.com
>
parent
f81d68aa
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
11 deletions
+15
-11
.github/scripts/setup-env.sh
.github/scripts/setup-env.sh
+5
-1
.github/workflows/build-cmake.yml
.github/workflows/build-cmake.yml
+2
-2
.github/workflows/tests.yml
.github/workflows/tests.yml
+2
-0
packaging/windows/internal/vc_env_helper.bat
packaging/windows/internal/vc_env_helper.bat
+6
-2
packaging/windows/internal/vc_install_helper.sh
packaging/windows/internal/vc_install_helper.sh
+0
-6
No files found.
.github/scripts/setup-env.sh
View file @
463cdeab
...
@@ -54,7 +54,11 @@ echo '::endgroup::'
...
@@ -54,7 +54,11 @@ echo '::endgroup::'
if
[[
"
${
OS_TYPE
}
"
==
windows
&&
"
${
GPU_ARCH_TYPE
}
"
==
cuda
]]
;
then
if
[[
"
${
OS_TYPE
}
"
==
windows
&&
"
${
GPU_ARCH_TYPE
}
"
==
cuda
]]
;
then
echo
'::group::Install VisualStudio CUDA extensions on Windows'
echo
'::group::Install VisualStudio CUDA extensions on Windows'
if
[[
"
${
VC_YEAR
:-}
"
==
"2022"
]]
;
then
TARGET_DIR
=
"/c/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Microsoft/VC/v170/BuildCustomizations"
else
TARGET_DIR
=
"/c/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/MSBuild/Microsoft/VC/v160/BuildCustomizations"
TARGET_DIR
=
"/c/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/MSBuild/Microsoft/VC/v160/BuildCustomizations"
fi
mkdir
-p
"
${
TARGET_DIR
}
"
mkdir
-p
"
${
TARGET_DIR
}
"
cp
-r
"
${
CUDA_HOME
}
/MSBuildExtensions/"
*
"
${
TARGET_DIR
}
"
cp
-r
"
${
CUDA_HOME
}
/MSBuildExtensions/"
*
"
${
TARGET_DIR
}
"
echo
'::endgroup::'
echo
'::endgroup::'
...
...
.github/workflows/build-cmake.yml
View file @
463cdeab
...
@@ -74,9 +74,9 @@ jobs:
...
@@ -74,9 +74,9 @@ jobs:
script
:
|
script
:
|
set -euo pipefail
set -euo pipefail
source packaging/windows/internal/vc_install_helper.sh
export PYTHON_VERSION=3.8
export PYTHON_VERSION=3.8
export VC_YEAR=2022
export VSDEVCMD_ARGS=""
export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }}
export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }}
export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }}
export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }}
...
...
.github/workflows/tests.yml
View file @
463cdeab
...
@@ -98,6 +98,8 @@ jobs:
...
@@ -98,6 +98,8 @@ jobs:
set -euxo pipefail
set -euxo pipefail
export PYTHON_VERSION=${{ matrix.python-version }}
export PYTHON_VERSION=${{ matrix.python-version }}
export VC_YEAR=2019
export VSDEVCMD_ARGS=""
export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }}
export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }}
export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }}
export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }}
...
...
packaging/windows/internal/vc_env_helper.bat
View file @
463cdeab
@echo
on
@echo
on
set
VC_VERSION_LOWER
=
16
set
VC_VERSION_LOWER
=
17
set
VC_VERSION_UPPER
=
17
set
VC_VERSION_UPPER
=
18
if
"
%VC_YEAR%
"
==
"2019"
(
set
VC_VERSION_LOWER
=
16
set
VC_VERSION_UPPER
=
17
)
if
"
%VC_YEAR%
"
==
"2017"
(
if
"
%VC_YEAR%
"
==
"2017"
(
set
VC_VERSION_LOWER
=
15
set
VC_VERSION_LOWER
=
15
set
VC_VERSION_UPPER
=
16
set
VC_VERSION_UPPER
=
16
...
...
packaging/windows/internal/vc_install_helper.sh
deleted
100644 → 0
View file @
f81d68aa
#!/bin/bash
set
-ex
export
VC_YEAR
=
2019
export
VSDEVCMD_ARGS
=
""
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment