Skip to content

Commit 820c8a4

Browse files
committed
fix conan folder names
1 parent 07cb540 commit 820c8a4

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ __pycache__/
296296
*.i
297297
.vscode/
298298
/docker/conan/
299+
/docker/conan2/
299300
/docker/data/
300301
/buildlinux/*
301302
**/CMakeFiles/*

docker/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ docker build \
3030
build_ubuntu-${ubuntu_version}/ \
3131
|| exit 1
3232

33-
folders=('build' 'conan')
33+
folders=('build' 'conan2')
3434
for folder in "${folders[@]}"; do
3535
if [[ ! -d "./${folder}" ]]; then
3636
mkdir ${folder}
@@ -44,7 +44,7 @@ docker run \
4444
-w /code \
4545
-v $PWD/..:/code \
4646
-v $PWD/build:/code/build \
47-
-v $PWD/conan:/home/user/.conan2 \
47+
-v $PWD/conan2:/home/user/.conan2 \
4848
-e CONFIG=${config} \
4949
-e TARGET_BUILD_ARCH=${target_build_arch} \
5050
-e BUILD_SHARED=${build_shared} \

0 commit comments

Comments
 (0)