lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds immediate migration results

Browse Source
This commit is contained in:
torsten committed 2026-08-18 22:12:24 +02:00
1 parent ba4121728b
commit 6a2a0667ab
2395 files changed
+357322 -2524
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/cmake/MacroCodeGenIdl.cmake
+16 -13
View File
@@ -56,7 +56,7 @@ MACRO(_CODEGEN_ACTION action srcList xmlIn in_files out_files)
SET(_cg codegen)
SET(_cg ngl_codegen)
ADD_CUSTOM_COMMAND(OUTPUT ${${out_files}}
COMMAND ${_cg}
ARGS -s ${xmlIn}
@@ -95,7 +95,7 @@ MACRO(CODEGEN_DATABASE_SQL srcList xmlFile_in)
)
_CODEGEN_ACTION("DATABASE" ${srcList} ${xmlFile_in} in_files out_files ${ARGN})
IF(NOT POLICY CMP0071)
QT5_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_db.h"
QT6_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_db.h"
"${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_db_impl.h")
ENDIF()
ENDMACRO()
@@ -110,7 +110,7 @@ MACRO(CODEGEN_DAO srcList xmlFile_in)
)
_CODEGEN_ACTION("dao" ${srcList} ${xmlFile_in} in_files out_files ${ARGN})
IF(NOT POLICY CMP0071)
QT5_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dao.cpp"
QT6_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dao.cpp"
"${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dao.h")
ENDIF()
ENDMACRO()
@@ -131,7 +131,7 @@ MACRO(CODEGEN_DATABASE srcList xmlFile_in)
)
_CODEGEN_ACTION("DATABASE_SERVER" ${srcList} ${xmlFile_in} in_files out_files ${ARGN})
IF(NOT POLICY CMP0071)
QT5_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_db.h"
QT6_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_db.h"
"${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_db_impl.h")
ENDIF()
ENDMACRO()
@@ -170,12 +170,12 @@ MACRO(CODEGEN_SQL srcList xmlFile_in)
ADD_CUSTOM_COMMAND(OUTPUT ${out_file_sql}
COMMAND ${CMAKE_COMMAND}
ARGS -E make_directory ${out_dir_sql}
COMMAND codegen
COMMAND ngl_codegen
ARGS -s ${xmlFile_in}
-a ${action}
-o ${out_dir_sql}
-i ${CMAKE_BINARY_DIR}/service_idl_files.txt
DEPENDS ${_cg} ${xmlFile_in}
DEPENDS ngl_codegen ${xmlFile_in}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
LIST(APPEND ${srcList} ${out_file_sql})
@@ -230,7 +230,10 @@ MACRO(CODEGEN_IDL_SVC srcList xmlFile_in)
CODEGEN_HANDLE_SVC_XML(${srcList} ${xmlFile_in})
ENDMACRO()
FIND_PACKAGE(PythonInterp 2.7 REQUIRED)
# Use Python 3 (Python 2.7 not available on modern distributions like openSUSE Leap 16.0)
FIND_PACKAGE(Python3 COMPONENTS Interpreter REQUIRED)
SET(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
MACRO(CODEGEN_TOPIC_TYPEDEFS srcList xmlFile_in)
_GET_SERVICENAME( "${xmlFile_in}" svcNameOut )
SET(inFile ${xmlFile_in})
@@ -291,7 +294,7 @@ MACRO(CODEGEN_CLIENT_TOPICS_IFC srcList xmlFile_in)
"${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc.h"
)
IF(NOT POLICY CMP0071)
QT5_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc.h")
QT6_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc.h")
ENDIF()
ELSEIF(part STREQUAL "FTC")
LIST(APPEND in_files
@@ -330,7 +333,7 @@ MACRO(CODEGEN_CLIENT_TOPICS_IMPL srcList xmlFile_in)
"${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc_impl.cpp"
)
IF(NOT POLICY CMP0071)
QT5_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc_impl.h")
QT6_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_dtc_impl.h")
ENDIF()
ELSEIF(part STREQUAL "FTC")
LIST(APPEND in_files
@@ -342,7 +345,7 @@ MACRO(CODEGEN_CLIENT_TOPICS_IMPL srcList xmlFile_in)
"${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_ftc_impl.cpp"
)
IF(NOT POLICY CMP0071)
QT5_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_ftc_impl.h")
QT6_WRAP_CPP(${srcList} "${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_ftc_impl.h")
ENDIF()
ELSE()
MESSAGE(FATAL_ERROR "Unkown part argument for CODEGEN_SERVER_TOPICS (${part})")
@@ -387,7 +390,7 @@ MACRO(CODEGEN_SERVER_TOPICS srcList xmlFile_in)
"${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_fts_impl.cpp"
)
IF(NOT POLICY CMP0071)
QT5_WRAP_CPP(${srcList} ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_fts_impl.h)
QT6_WRAP_CPP(${srcList} ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_fts_impl.h)
ENDIF()
ELSE()
MESSAGE(FATAL_ERROR "Unkown part argument for CODEGEN_SERVER_TOPICS (${part})")
@@ -410,7 +413,7 @@ MACRO(CODEGEN_TOPIC_TYPE_PLUGIN srcList xmlFile_in)
)
_CODEGEN_ACTION("DDS_TOPICS" ${srcList} "${xmlFile_in}" in_files out_files)
IF(NOT POLICY CMP0071)
QT5_WRAP_CPP(${srcList} ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_topic_type_plugin.h)
QT6_WRAP_CPP(${srcList} ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_topic_type_plugin.h)
ENDIF()
ENDMACRO()
@@ -453,7 +456,7 @@ MACRO(CODEGEN_RECORD_REPLAY_PLUGIN srcList xmlFile_in)
)
_CODEGEN_ACTION("DDS_TOPICS" ${srcList} "${xmlFile_in}" in_files out_files)
IF(NOT POLICY CMP0071)
QT5_WRAP_CPP(${srcList} ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_record_replay_plugin.h)
QT6_WRAP_CPP(${srcList} ${CMAKE_CURRENT_BINARY_DIR}/${svcNameOut}_record_replay_plugin.h)
ENDIF()
ENDMACRO()