Migration of Legatus codebase to Qt6 with RTI Connext DDS 7.7 integration is partially complete. Core DDS targets build successfully, but ProjectDataManagement module blocks full ddsfts compilation due to IDL definition conflicts.
This commit is contained in:
256 files changed
+1170
-610
No files matched your search
@@ -7,6 +7,8 @@
|
||||
# Created by Mike Wille, NLSE, 2018-02-15
|
||||
#
|
||||
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
@@ -31,6 +33,10 @@ SET(RmeDarkStylePlugin_SRCS
|
||||
NGL_ADD_BIG_RESOURCES(RmeDarkStylePlugin_SRCS resources/rme_dark_style.qrc)
|
||||
NGL_ADD_LIBRARY2(AAR SV WS RmeDarkStylePlugin SHARED ${RmeDarkStylePlugin_SRCS})
|
||||
|
||||
# Add include path for PluginInterfaces for both compilation and AUTOMOC
|
||||
TARGET_INCLUDE_DIRECTORIES(RmeDarkStylePlugin PRIVATE ${CMAKE_SOURCE_DIR}/Lts/Common)
|
||||
set_target_properties(RmeDarkStylePlugin PROPERTIES AUTOMOC_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/Lts/Common")
|
||||
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(RmeDarkStylePlugin
|
||||
PRIVATE
|
||||
|
||||
@@ -10,11 +10,10 @@
|
||||
|
||||
class RmeDarkStyle : public QObject, public StylePlugin::Plugin
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PLUGIN_METADATA(IID "style:3:rme.dark")
|
||||
Q_INTERFACES(StylePlugin::Plugin)
|
||||
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
RmeDarkStyle();
|
||||
virtual ~RmeDarkStyle();
|
||||
|
||||
Reference in new issue
Block a user