diff --git a/cmake/get_cpm.cmake b/cmake/get_cpm.cmake index 4b28edbf..163609c0 100644 --- a/cmake/get_cpm.cmake +++ b/cmake/get_cpm.cmake @@ -1,4 +1,4 @@ -set(CPM_DOWNLOAD_VERSION 0.38.2) +set(CPM_DOWNLOAD_VERSION 0.40.2) if(CPM_SOURCE_CACHE) set(CPM_DOWNLOAD_LOCATION diff --git a/tools/gen_str_catalog.py b/tools/gen_str_catalog.py index 74f02615..1a5ccdf1 100755 --- a/tools/gen_str_catalog.py +++ b/tools/gen_str_catalog.py @@ -93,7 +93,7 @@ def stable_module_key(module: str): def read_input(filenames: list[str], stable_ids): - line_re = re.compile(r"^.+?(unsigned int (catalog|module)<(.+?)>\(\))$") + line_re = re.compile(r"^.*(unsigned int (catalog|module)<(.+?)>\(\))$") def read_file(filename): with open(filename, "r") as f: