Drops BUILD_GRANTLEE fallback paths from codegen macros

qt6-after/qt6-migrated-legatus/cmake/MacroCodeGenIdl.cmake

@@ -164,7 +164,6 @@ MACRO(INSTALL_SHARED_FILES srcList)
 ENDMACRO()
 
 MACRO(CODEGEN_SQL srcList xmlFile_in)
-  IF(BUILD_GRANTLEE)
   _GET_SERVICENAME( "${xmlFile_in}" svcNameOut )
   SET(out_dir_sql  "${CMAKE_BINARY_DIR}/share/Lts/sql/")
   SET(out_file_sql "${out_dir_sql}/${svcNameOut}.sql")
@@ -185,11 +184,6 @@ MACRO(CODEGEN_SQL srcList xmlFile_in)
 
 
   NGL_INSTALL(SV AAR FILES ${out_file_sql} DESTINATION share/Lts/sql)
-  ELSE()
-    # BUILD_GRANTLEE disabled: skip SQL generation
-    # SQL files will not be generated; modules may need pre-generated SQL files
-    MESSAGE(STATUS "BUILD_GRANTLEE disabled: skipping SQL generation for ${xmlFile_in}")
-  ENDIF()
 ENDMACRO()
 
 MACRO(CODEGEN_HANDLE_SVC_XML srcList xmlFile_in)
@@ -224,7 +218,6 @@ MACRO(CODEGEN_IDL_SVC srcList xmlFile_in)
                 "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_translation.cpp"
                 "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_translation.h")
   
-  IF(BUILD_GRANTLEE)
   SET(in_files  "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc.idl.grantlee"
                 "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_enums.idl.grantlee"
                 "${CMAKE_SOURCE_DIR}/Lts/Common/CodeGen/svc_json.cpp.grantlee"
@@ -237,47 +230,6 @@ MACRO(CODEGEN_IDL_SVC srcList xmlFile_in)
   SET_PROPERTY(GLOBAL APPEND PROPERTY CODEGEN_IDL_FILES "${idl_out_files}")
   SET_SOURCE_FILES_PROPERTIES(${idl_out_files} PROPERTIES HEADER_FILE_ONLY TRUE)
   _CODEGEN_ACTION("DDS_TOPICS" ${srcList} "${xmlFile_in}" in_files out_files ${ARGN})
-  ELSE()
-    # BUILD_GRANTLEE disabled: use pre-generated files if they exist
-    MESSAGE(STATUS "BUILD_GRANTLEE disabled: checking for pre-generated files for ${svcNameOut}")
-    
-    # Check if pre-generated .idl files exist in source directory
-    SET(source_idl "${CMAKE_CURRENT_SOURCE_DIR}/${svcNameOut}.idl")
-    SET(source_idl_enums "${CMAKE_CURRENT_SOURCE_DIR}/${svcNameOut}_enums.idl")
-    
-    IF(EXISTS ${source_idl} AND EXISTS ${source_idl_enums})
-      MESSAGE(STATUS "Found pre-generated IDL files for ${svcNameOut}")
-      # Copy pre-generated files to build directory
-      ADD_CUSTOM_COMMAND(OUTPUT ${out_files}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${source_idl} ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}.idl
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${source_idl_enums} ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_enums.idl
-        COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_json.cpp
-        COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_json.h
-        COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_translation.cpp
-        COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_translation.h
-        DEPENDS ${source_idl} ${source_idl_enums}
-        COMMENT "Copying pre-generated IDL files for ${svcNameOut}"
-      )
-      SET_PROPERTY(GLOBAL APPEND PROPERTY CODEGEN_IDL_FILES "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}.idl" "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_enums.idl")
-      SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}.idl ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_enums.idl PROPERTIES HEADER_FILE_ONLY TRUE)  
-      LIST(APPEND ${srcList} ${out_files})
-    ELSE()
-      MESSAGE(WARNING "BUILD_GRANTLEE disabled but no pre-generated IDL files found for ${svcNameOut}. Skipping service.")
-      # Create empty stub files to satisfy CMake
-      ADD_CUSTOM_COMMAND(OUTPUT ${out_files}
-        COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}.idl
-        COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_enums.idl
-        COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_json.cpp
-        COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_json.h
-        COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_translation.cpp
-        COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_translation.h
-        COMMENT "Creating stub files for ${svcNameOut} (no pre-generated IDL)"
-      )
-      SET_PROPERTY(GLOBAL APPEND PROPERTY CODEGEN_IDL_FILES "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}.idl" "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_enums.idl")
-      SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}.idl ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_enums.idl PROPERTIES HEADER_FILE_ONLY TRUE)  
-      LIST(APPEND ${srcList} ${out_files})
-    ENDIF()
-  ENDIF()
 
   CODEGEN_HANDLE_SVC_XML(${srcList} ${xmlFile_in})
 ENDMACRO()
@@ -336,35 +288,6 @@ MACRO(CODEGEN_CLIENT_TOPICS_IFC srcList xmlFile_in)
     SET(_CST_PARTS "DTC" "FTC")
   ENDIF()
   
-  # When BUILD_GRANTLEE=OFF, use pre-generated files from source directory
-  IF(NOT BUILD_GRANTLEE)
-    FOREACH(part ${_CST_PARTS})
-      IF(part STREQUAL "DTC")
-        SET(generated_file "${CMAKE_CURRENT_SOURCE_DIR}/${svcNameOut}_dtc.h")
-        IF(EXISTS "${generated_file}")
-          LIST(APPEND ${srcList} "${generated_file}")
-          IF(NOT POLICY CMP0071)
-            QT6_WRAP_CPP(${srcList} "${generated_file}")
-          ENDIF()
-        ELSE()
-          MESSAGE(FATAL_ERROR "Pre-generated file ${generated_file} not found. BUILD_GRANTLEE=OFF requires pre-generated files.")
-        ENDIF()
-      ELSEIF(part STREQUAL "FTC")
-        SET(generated_file "${CMAKE_CURRENT_SOURCE_DIR}/${svcNameOut}_ftc.h")
-        IF(EXISTS "${generated_file}")
-          LIST(APPEND ${srcList} "${generated_file}")
-          IF(NOT POLICY CMP0071)
-            QT6_WRAP_CPP(${srcList} "${generated_file}")
-          ENDIF()
-        ELSE()
-          MESSAGE(FATAL_ERROR "Pre-generated file ${generated_file} not found. BUILD_GRANTLEE=OFF requires pre-generated files.")
-        ENDIF()
-      ELSE()
-        MESSAGE(FATAL_ERROR "Unkown part argument for CODEGEN_SERVER_TOPICS (${part})")
-      ENDIF()
-    ENDFOREACH()
-  ELSE()
-    # Original codegen logic with Grantlee
   SET(in_files "")
   SET(out_files "")
   FOREACH(part ${_CST_PARTS})
@@ -393,12 +316,9 @@ MACRO(CODEGEN_CLIENT_TOPICS_IFC srcList xmlFile_in)
     ENDIF()
   ENDFOREACH()
   _CODEGEN_ACTION("DDS_TOPICS" ${srcList} "${xmlFile_in}" in_files out_files)
-  ENDIF()
 ENDMACRO()
 
 MACRO(CODEGEN_CLIENT_TOPICS_IMPL srcList xmlFile_in)
-  # Skip code generation when BUILD_GRANTLEE=OFF - use pre-generated files instead
-  IF(BUILD_GRANTLEE)
   SET(options)
   SET(oneValueArgs)
   SET(multiValueArgs PARTS)
@@ -440,7 +360,6 @@ MACRO(CODEGEN_CLIENT_TOPICS_IMPL srcList xmlFile_in)
     ENDIF()
   ENDFOREACH()
   _CODEGEN_ACTION("DDS_TOPICS" ${srcList} "${xmlFile_in}" in_files out_files)
-  ENDIF()
 ENDMACRO()
 
 MACRO(CODEGEN_SERVER_TOPICS srcList xmlFile_in)