From 0d0f2cdafd7597ff84baf7a4790f3f016fe2337f Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Sun, 4 Jul 2021 17:14:28 +0200 Subject: cmake: Only use the `cm_` prefix when it is actually required (fixes #8955) --- mesonbuild/cmake/interpreter.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'mesonbuild') diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index 745def143..fe66becb9 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -26,6 +26,7 @@ from ..mesonlib import MachineChoice, OrderedSet, version_compare, path_is_in_ro from ..mesondata import mesondata from ..compilers.compilers import assembler_suffixes, lang_suffixes, header_suffixes, obj_suffixes, lib_suffixes, is_header from ..programs import ExternalProgram +from ..coredata import FORBIDDEN_TARGET_NAMES from enum import Enum from functools import lru_cache from pathlib import Path @@ -120,7 +121,9 @@ transfer_dependencies_from = ['header_only'] _cmake_name_regex = re.compile(r'[^_a-zA-Z0-9]') def _sanitize_cmake_name(name: str) -> str: name = _cmake_name_regex.sub('_', name) - return 'cm_' + name + if name in FORBIDDEN_TARGET_NAMES or name.startswith('meson'): + name = 'cm_' + name + return name class OutputTargetMap: rm_so_version = re.compile(r'(\.[0-9]+)+$') -- cgit v1.2.3