feat: full support of precompiled libraries

Required changing the CMakeLists.txt template structure
and targets definition designs to handle the different cases (precompile=true|full, float ABI...).

Author: massonal

CI/update/cmake_libs.py

@@ -34,7 +34,9 @@
             continue
 
         config = autoconfig(lib)
+        config["extra_libs"].add("core")
         render(lib, cmake_template, config)
 else :
     config = autoconfig(rootdir)
+    config["extra_libs"].add("core")
     render(rootdir, cmake_template, config)

CI/update/templates/CMakeLists.txt

@@ -1,95 +1,69 @@
-{% if precompiled != "full" %}
-
+{% if objlib and sources %}
+# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
+# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
+cmake_minimum_required(VERSION 3.21)
+{% endif %}
 
-add_library({{target}}{{" OBJECT" if objlib}} EXCLUDE_FROM_ALL
-  {% for file in sources | sort %}
-  {{file}}
-  {% endfor %}
-)
+add_library({{target}} INTERFACE)
+add_library({{target}}_usage INTERFACE)
 
 {% if includedirs %}
-target_include_directories({{target}} PUBLIC
+target_include_directories({{target}}_usage INTERFACE
   {% for dir in  includedirs | sort %}
   {{dir}}
   {% endfor %}
 )
 {% endif %}
 
-target_link_libraries({{target}} PUBLIC
-  core_config
-  {% for lib in extra_libs | sort %}
-  {{lib}}
-  {% endfor %}
-)
-
-{% if precompiled == "true" %}
-if(EXISTS "{{"${CMAKE_CURRENT_SOURCE_DIR}"}}/src/{{"${"}}MCU{{"}"}}/lib{{target}}.a")
-target_link_libraries({{target}} PUBLIC
-  "{{"${CMAKE_CURRENT_SOURCE_DIR}"}}/src/{{"${"}}MCU{{"}"}}/lib{{target}}.a"
-)
-endif()
-{% endif %}
-
 {% if ldflags %}
-taget_link_options({{target}} PUBLIC
+taget_link_options({{target}}_usage INTERFACE
   {{ldflags}}
 )
 {% endif %}
 
-{% else %} {# precompiled == "full" #}
-
-{#
-When precompiled = full, we define 3 targets:
-target, target_bin, target_usage
-target is the externally usable library
-target_bin contains the source files, to be used as fallback
-target_usage contains the "transitive usage requirements", i.e., include directories, linker options...
-
-target wraps target_usage and [target_bin or the precompiled library]
-target_bin uses target_usage (it's a public interface, i.e. meant for me and my users)
-#}
-
-add_library({{target}} INTERFACE)
-add_library({{target}}_usage INTERFACE)
-add_library({{target}}_bin {{" OBJECT" if objlib}} EXCLUDE_FROM_ALL
-{% for file in sources | sort %}
-  {{file}}
-{% endfor %}
+target_link_libraries({{target}}_usage INTERFACE
+  core_config
+  {% for lib in extra_libs | sort %}
+  {{lib}}
+  {% endfor %}
 )
-target_link_libraries({{target}} INTERFACE {{target}}_usage)
-target_link_libraries({{target}}_bin PUBLIC {{target}}_usage)
 
-if(EXISTS "./src/{{"${"}}MCU{{"}"}}/lib{{target}}.a")
-  target_link_libraries({{target}} INTERFACE
-    "./src/{{"${"}}MCU{{"}"}}/lib{{target}}.a"
-  )
-else()
-  target_link_libraries({{target}} INTERFACE
-    {{target}}_bin
-    $<TARGET_OBJECTS:{{target}}_bin>
-  )
-endif()
+target_link_libraries({{target}} INTERFACE {{target}}_usage)
 
 
-{% if includedirs %}
-target_include_directories({{target}}_usage INTERFACE
-  {% for dir in  includedirs | sort %}
-  {{dir}}
-  {% endfor %}
-)
+{% if precompiled in ("true", "full") %}
+set({{target}}_PRECOMPILED false)
+{% for config, libs in binaries | dictsort | reverse %}
+{{"if" if loop.first else "elseif"}} ("${MCU}${FPCONF}" STREQUAL "{{config}}")
+  target_link_libraries({{target}}_usage INTERFACE
+    {% for lib in libs %}
+    "{{"${CMAKE_CURRENT_SOURCE_DIR}/"}}{{lib}}"
+    {% endfor %}
+  )
+  set({{target}}_PRECOMPILED true)
+{{"endif()" if loop.last}}
+{% endfor %}
 {% endif %}
 
-target_link_libraries({{target}}_usage INTERFACE
-  core_config
-  {% for lib in extra_libs | sort %}
-  {{lib}}
+{% if sources %}
+add_library({{target}}_bin {{"OBJECT" if objlib else "STATIC"}} EXCLUDE_FROM_ALL
+  {% for file in sources | sort %}
+  {{file}}
   {% endfor %}
 )
+target_link_libraries({{target}}_bin PUBLIC {{target}}_usage)
 
-{% if ldflags %}
-taget_link_options({{target}}_usage INTERFACE
-  {{ldflags}}
+{% if precompiled == "full" %}
+if(NOT {{"${"}}{{target}}_PRECOMPILED{{"}"}})
+{% endif %}
+target_link_libraries({{target}} INTERFACE
+  {{target}}_bin
+  {% if objlib %}
+  $<TARGET_OBJECTS:{{target}}_bin>
+  {% endif %}
 )
+{% if precompiled == "full" %}
+endif()
 {% endif %}
 
-{% endif %} {# precompiled ?= "full" #}
+{% endif %}

CI/update/templates/boards_db.cmake

@@ -6,6 +6,9 @@ set({{pnum}}_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/{{config.build.
 set({{pnum}}_MAXSIZE {{config.upload.maximum_size}})
 set({{pnum}}_MAXDATASIZE {{config.upload.maximum_data_size}})
 set({{pnum}}_MCU {{config.build.mcu}})
+{% if config._fpconf != "-" %}
+set({{pnum}}_FPCONF {{config._fpconf}})
+{% endif %}
 add_library({{pnum}} INTERFACE)
 target_compile_options({{pnum}} INTERFACE
   "SHELL:{{config.build.st_extra_flags}}"

CI/utils/cmake_gen.py

@@ -11,6 +11,7 @@ def get_default_config() :
         objlib = True,
         ldflags = "",
         precompiled = "false",
+        binaries = dict(),
     )
 
 def parse_configfile(file) :
@@ -52,6 +53,22 @@ def render(dir, template, config) :
     with open(dir / "CMakeLists.txt", "w") as outfile :
         outfile.write(template.render(**config))
 
+def get_static_libs(dir) :
+    result = dict()
+    cpu = ""
+    fpconf = "-" # format: f"{fpu}-{float_abi}"; this makes "-" by default
+    for file in dir.glob("src/*/lib*.a") :
+        if not file.is_file() :
+            continue
+        cpu = file.parent.name
+        result.setdefault(cpu+fpconf, list()).append(file.relative_to(dir))
+    for file in dir.glob("src/*/*/lib*.a") :
+        if not file.is_file() :
+            continue
+        fpconf = file.parent.name
+        cpu = file.parent.parent.name
+        result.setdefault(cpu+fpconf, list()).append(file.relative_to(dir))
+    return result
 
 def config_for_bareflat(dir, force_recurse=False) :
     # no library.properties
@@ -76,6 +93,7 @@ def config_for_modern(dir) :
     config["target"] = dir.name
     config["sources"].update(get_sources(dir/"src", recursive=True, relative_to=dir))
     config["includedirs"].add((dir/"src").relative_to(dir))
+    config["binaries"].update(get_static_libs(dir))
 
     return config
 

CMakeLists.txt

@@ -238,7 +238,6 @@ target_link_libraries(stm32_runtime INTERFACE
   core_config
 
   SrcWrapper
-  $<TARGET_OBJECTS:SrcWrapper>
   core
   variant