Merge pull request #651 from oxidase/fixes

Some small fixes

Author: elbeno

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

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: