gary/sc9k
1
0
Fork 0
mirror of https://github.com/gtalent/sc9k.git synced 2025-07-04 06:01:45 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add camera reboot option

Browse Source
This commit is contained in:
Gary Talent
2023-10-15 16:02:24 -05:00
parent 56f98eed60
commit ac7bb9c585
7 changed files with 52 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
deps/buildcore/scripts/pybb.py vendored
View File

@ -1,7 +1,7 @@
#! /usr/bin/env python3
#
# Copyright 2016 - 2021 gary@drinkingtea.net
# Copyright 2016 - 2023 gary@drinkingtea.net
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
@ -74,7 +74,7 @@ def conan() -> int:
return 1
if err != 0:
return err
args = ['conan', 'install', '../', '--build=missing', '-pr', project_name]
args = ['conan', 'install', '../', '-of', '.', '--build=missing', '-pr', project_name]
os.chdir(conan_dir)
err = subprocess.run(args).returncode
if err != 0:

5
deps/buildcore/scripts/setup-build.py vendored
View File

@ -1,7 +1,7 @@
#! /usr/bin/env python3
#
# Copyright 2016 - 2021 gary@drinkingtea.net
# Copyright 2016 - 2023 gary@drinkingtea.net
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
@ -28,6 +28,7 @@ def main() -> int:
parser.add_argument('--build_root', help='Path to the root of build directories (must be in project dir)', default='build')
parser.add_argument('--toolchain', help='Path to CMake toolchain file', default='')
parser.add_argument('--current_build', help='Indicates whether or not to make this the active build', default=1)
parser.add_argument('--use_conan', help='Indicates whether or not should use .conanbuild/conan_toolchain.cmake', default='0')
args = parser.parse_args()
if args.build_type == 'asan':
@ -76,6 +77,8 @@ def main() -> int:
'-DBUILDCORE_BUILD_CONFIG={:s}'.format(build_config),
'-DBUILDCORE_TARGET={:s}'.format(args.target),
]
if args.use_conan != '0':
cmake_cmd.append('-DCMAKE_TOOLCHAIN_FILE={:s}'.format('.conanbuild/conan_toolchain.cmake'))
if qt_path != '':
cmake_cmd.append(qt_path)
if platform.system() == 'Windows':