mewin/scons-plus-plus
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Added cxxflags to cmake version hash calculation.

Browse Source
This commit is contained in:
Patrick 2024-12-13 23:39:27 +01:00
parent b546931c09
commit 134fb106a8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/cmake_project.py
View File

@ -40,10 +40,11 @@ def _generate_cmake_args(env: Environment, dependencies: 'list[dict]') -> 'list[
args.append(f'-D{name}={cmd_quote(value)}') args.append(f'-D{name}={cmd_quote(value)}')
return args return args
def _calc_version_hash(dependencies: 'list[dict]') -> str: def _calc_version_hash(env, dependencies: 'list[dict]') -> str:
return json.dumps({ return json.dumps({
'version': _VERSION, 'version': _VERSION,
'dependencies': dependencies 'dependencies': dependencies,
'cxxflags': env['DEPS_CXXFLAGS']
}) })
def _cmake_project(env: Environment, project_root: str, generate_args: 'list[str]' = [], build_args : 'list[str]' = [], install_args : 'list[str]' = [], dependencies: 'list[dict]' = []) -> dict: def _cmake_project(env: Environment, project_root: str, generate_args: 'list[str]' = [], build_args : 'list[str]' = [], install_args : 'list[str]' = [], dependencies: 'list[dict]' = []) -> dict:
@ -51,7 +52,7 @@ def _cmake_project(env: Environment, project_root: str, generate_args: 'list[str
build_dir = os.path.join(project_root, f'build_{config}') build_dir = os.path.join(project_root, f'build_{config}')
install_dir = os.path.join(project_root, f'install_{config}') install_dir = os.path.join(project_root, f'install_{config}')
version_hash = _calc_version_hash(dependencies) version_hash = _calc_version_hash(env, dependencies)
stamp_file = pathlib.Path(install_dir, _BUILT_STAMPFILE) stamp_file = pathlib.Path(install_dir, _BUILT_STAMPFILE)
is_built = stamp_file.exists() is_built = stamp_file.exists()