chore(CMake/migrate): relax Grantlee/RTI requirements and avoid permission issues in fallback docker run\n\n- Make Grantlee optional and skip codegen_grantlee when missing

- Keep RTI optional (no REQUIRED) - Use host UID:GID when running fallback docker run to allow cleaning build dir \nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-07-17 12:55:35 +02:00
1 parent 3dbbcc1303
commit 699d745a6a
@@ -5,7 +5,7 @@
 #

 FIND_PACKAGE(RTI)
-FIND_PACKAGE(Grantlee5 REQUIRED)
+FIND_PACKAGE(Grantlee5)

 NGL_ADD_LIBRARY(ALL codegen_base SHARED
  codegen_export.h
@@ -43,71 +43,75 @@ else()
 endif()
 NGL_INSTALL_TARGET(codegen_base)

-NGL_ADD_LIBRARY(ALL codegen_grantlee STATIC
-  CppTopicGeneratorGrantlee.cpp
-  CppTopicGeneratorGrantlee.h
-  DaoGeneratorGrantlee.cpp
-  DaoGeneratorGrantlee.h
-  DatabaseGeneratorGrantlee.cpp
-  DatabaseGeneratorGrantlee.h
-  GeneratorGrantleeBase.cpp
-  GeneratorGrantleeBase.h
-  GrantleeWrappers.cpp
-  GrantleeWrappers.h
+if (TARGET Grantlee5::Templates)
+  NGL_ADD_LIBRARY(ALL codegen_grantlee STATIC
+    CppTopicGeneratorGrantlee.cpp
+    CppTopicGeneratorGrantlee.h
+    DaoGeneratorGrantlee.cpp
+    DaoGeneratorGrantlee.h
+    DatabaseGeneratorGrantlee.cpp
+    DatabaseGeneratorGrantlee.h
+    GeneratorGrantleeBase.cpp
+    GeneratorGrantleeBase.h
+    GrantleeWrappers.cpp
+    GrantleeWrappers.h

-  svc.idl.grantlee
-  svc_enums.idl.grantlee
+    svc.idl.grantlee
+    svc_enums.idl.grantlee

-  svc_translation.cpp.grantlee
-  svc_translation.h.grantlee
+    svc_translation.cpp.grantlee
+    svc_translation.h.grantlee

-  svc_dao.cpp.grantlee
-  svc_dao.h.grantlee
+    svc_dao.cpp.grantlee
+    svc_dao.h.grantlee

-  svc_db.h.grantlee
-  svc_db_impl.h.grantlee
-  svc_db_impl.cpp.grantlee
+    svc_db.h.grantlee
+    svc_db_impl.h.grantlee
+    svc_db_impl.cpp.grantlee

-  svc_dtc.h.grantlee
-  svc_dtc_impl.cpp.grantlee
-  svc_dtc_impl.h.grantlee
+    svc_dtc.h.grantlee
+    svc_dtc_impl.cpp.grantlee
+    svc_dtc_impl.h.grantlee

-  svc_dts.h.grantlee
-  svc_dts_impl.cpp.grantlee
-  svc_dts_impl.h.grantlee
+    svc_dts.h.grantlee
+    svc_dts_impl.cpp.grantlee
+    svc_dts_impl.h.grantlee

-  svc_ftc.h.grantlee
-  svc_ftc_impl.cpp.grantlee
-  svc_ftc_impl.h.grantlee
+    svc_ftc.h.grantlee
+    svc_ftc_impl.cpp.grantlee
+    svc_ftc_impl.h.grantlee

-  svc_fts.h.grantlee
-  svc_fts_impl.cpp.grantlee
-  svc_fts_impl.h.grantlee
+    svc_fts.h.grantlee
+    svc_fts_impl.cpp.grantlee
+    svc_fts_impl.h.grantlee

-  svc_json.cpp.grantlee
-  svc_json.h.grantlee
+    svc_json.cpp.grantlee
+    svc_json.h.grantlee

-  svc_topic_type_plugin.cpp.grantlee
-  svc_topic_type_plugin.h.grantlee
+    svc_topic_type_plugin.cpp.grantlee
+    svc_topic_type_plugin.h.grantlee

-  svc_record_replay_plugin.cpp.grantlee
-  svc_record_replay_plugin.h.grantlee
+    svc_record_replay_plugin.cpp.grantlee
+    svc_record_replay_plugin.h.grantlee

-  codegen_simple.py
-)
+    codegen_simple.py
+  )

-NGL_TARGET_LINK_LIBRARIES(codegen_grantlee
-  PRIVATE
-    Grantlee5::Templates
-    NGLLogger
-    ProjectConfig
-  PUBLIC
-    codegen_base
-)
-NGL_TARGET_INCLUDE_DIRECTORIES(codegen_grantlee
-  PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/../
-)
+  NGL_TARGET_LINK_LIBRARIES(codegen_grantlee
+    PRIVATE
+      Grantlee5::Templates
+      NGLLogger
+      ProjectConfig
+    PUBLIC
+      codegen_base
+  )
+  NGL_TARGET_INCLUDE_DIRECTORIES(codegen_grantlee
+    PUBLIC
+      ${CMAKE_CURRENT_SOURCE_DIR}/../
+  )
+else()
+  message(STATUS "Grantlee5 not found; skipping codegen_grantlee target")
+endif()

 NGL_ADD_EXECUTABLE(ALL codegen
  main_grantlee.cpp