Adds latest migration results
This commit is contained in:
829 files changed
+35074
-70886
No files matched your search
@@ -5,6 +5,14 @@
|
||||
#
|
||||
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(awss_SRCS
|
||||
main.cpp
|
||||
#awss_webscoket_server.cpp
|
||||
@@ -42,7 +50,7 @@ NGL_TARGET_LINK_LIBRARIES(AdlerWebSocketSimulator
|
||||
nglapplication
|
||||
saaTelegrams
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
)
|
||||
NGL_INSTALL_TARGET(AdlerWebSocketSimulator)
|
||||
|
||||
|
||||
@@ -5,6 +5,21 @@
|
||||
# Created by Hannes Fritsche, SLSE, 2017-09-05
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
|
||||
|
||||
SET(SRCS
|
||||
@@ -20,18 +35,20 @@ NGL_WRAP_UI(SRCS ui/mainwindow.ui)
|
||||
|
||||
NGL_ADD_EXECUTABLE(WS NO_TRANSLATION CnrProxyTester ${SRCS})
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(CnrProxyTester
|
||||
Qt6::Widgets
|
||||
Qt6::Core
|
||||
Qt6::WebSockets
|
||||
nglapplication
|
||||
LtsDataView
|
||||
LtsWidgets
|
||||
nglwidgets
|
||||
LtsPluginLoader
|
||||
StylePluginInterface
|
||||
LtsUtilsCoreHeaderOnly
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(CnrProxyTester
|
||||
${Qt6_Widgets}
|
||||
Qt6::Core
|
||||
${Qt6_WebSockets}
|
||||
nglapplication
|
||||
LtsDataView
|
||||
LtsWidgets
|
||||
nglwidgets
|
||||
LtsPluginLoader
|
||||
StylePluginInterface
|
||||
LtsUtilsCoreHeaderOnly
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET_DEVEL(CnrProxyTester)
|
||||
|
||||
@@ -8,6 +8,14 @@
|
||||
# Created by Mike Wille, NLSE, 2018-02-02
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
IF(NOT WIN32)
|
||||
SET(ConfigX_SRCS
|
||||
main.cpp
|
||||
@@ -26,9 +34,11 @@ IF(NOT WIN32)
|
||||
NGL_WRAP_UI(ConfigX_SRCS ${ConfigX_UICS})
|
||||
NGL_ADD_EXECUTABLE(WS ConfigX NO_TRANSLATION ${ConfigX_SRCS} ${ConfigX_UICS})
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(ConfigX
|
||||
Qt6::Widgets
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(ConfigX
|
||||
${Qt6_Widgets}
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(ConfigX)
|
||||
ENDIF(NOT WIN32)
|
||||
@@ -5,6 +5,14 @@
|
||||
# Created by Hanna Rathje, SLSE, 2017-12-14
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
|
||||
|
||||
SET(SRCS_copy
|
||||
@@ -49,20 +57,22 @@ NGL_WRAP_UI(SRCS ui/db_administration.ui ui/showLogFile.ui)
|
||||
|
||||
NGL_ADD_TOOL_ICON(dbAdministration)
|
||||
NGL_ADD_EXECUTABLE(AAR SV dbAdministration ${SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(dbAdministration
|
||||
dbAdminCopyExercise
|
||||
Qt6::Widgets
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
nglapplication
|
||||
ngldb
|
||||
nglcoreapplication
|
||||
ngltools
|
||||
ngltranslator
|
||||
nglwidgets
|
||||
NGLLogger
|
||||
LtsCommandLineParser
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(dbAdministration
|
||||
dbAdminCopyExercise
|
||||
${Qt6_Widgets}
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
nglapplication
|
||||
ngldb
|
||||
nglcoreapplication
|
||||
ngltools
|
||||
ngltranslator
|
||||
nglwidgets
|
||||
NGLLogger
|
||||
LtsCommandLineParser
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(dbAdministration)
|
||||
NGL_INSTALL(SV AAR FILES log4cxx_dba.props DESTINATION bin)
|
||||
|
||||
@@ -5,6 +5,14 @@
|
||||
# Created by Iuliana Ojog, 2021-02-10
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(SRCS
|
||||
db_update.cpp
|
||||
db_update.h
|
||||
@@ -294,19 +302,21 @@ set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
|
||||
|
||||
NGL_ADD_EXECUTABLE(SV dbUpdate ${SRCS})
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(dbUpdate
|
||||
Qt6::Widgets
|
||||
Qt6::Core
|
||||
nglapplication
|
||||
ngldb
|
||||
nglcoreapplication
|
||||
ngltools
|
||||
ngltranslator
|
||||
nglwidgets
|
||||
nglsettings
|
||||
NGLLogger
|
||||
LtsCommandLineParser
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(dbUpdate
|
||||
${Qt6_Widgets}
|
||||
Qt6::Core
|
||||
nglapplication
|
||||
ngldb
|
||||
nglcoreapplication
|
||||
ngltools
|
||||
ngltranslator
|
||||
nglwidgets
|
||||
nglsettings
|
||||
NGLLogger
|
||||
LtsCommandLineParser
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(dbUpdate)
|
||||
NGL_INSTALL(SV FILES log4cxx_dbu.props DESTINATION bin)
|
||||
|
||||
@@ -6,6 +6,14 @@
|
||||
# CMakeLists.txt fuer DdsView
|
||||
#
|
||||
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
else()
|
||||
set(Qt6_Gui "")
|
||||
endif()
|
||||
|
||||
|
||||
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
|
||||
|
||||
SET(ddsview_SRCS
|
||||
@@ -69,25 +77,27 @@ NGL_WRAP_UI(ddsview_SRCS ${ddsview_UICS})
|
||||
NGL_ADD_TOOL_ICON(ddsview_SRCS "dds")
|
||||
|
||||
NGL_ADD_EXECUTABLE(ddsview TOOLSWS TOOLSSV NO_TRANSLATION WIN32 ${ddsview_SRCS} ${ddsview_UICS})
|
||||
NGL_TARGET_LINK_LIBRARIES(ddsview
|
||||
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
||||
LtsCommandLineParser
|
||||
LtsCoordTrans
|
||||
ltsCoordWidget
|
||||
LtsWidgets
|
||||
LtsPluginLoader
|
||||
nglapplication
|
||||
NGLLogger
|
||||
nglsettings
|
||||
nglwidgets
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::Xml
|
||||
RTI::nddsc
|
||||
RTI::nddscore
|
||||
topicdiscover
|
||||
topic_type_plugin
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(ddsview
|
||||
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
||||
LtsCommandLineParser
|
||||
LtsCoordTrans
|
||||
ltsCoordWidget
|
||||
LtsWidgets
|
||||
LtsPluginLoader
|
||||
nglapplication
|
||||
NGLLogger
|
||||
nglsettings
|
||||
nglwidgets
|
||||
Qt6::Core
|
||||
${Qt6_Gui}
|
||||
Qt6::Xml
|
||||
RTI::nddsc
|
||||
RTI::nddscore
|
||||
topicdiscover
|
||||
topic_type_plugin
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(ddsview)
|
||||
NGL_INSTALL(TOOLSWS TOOLSSV FILES log4cxx_ddsview.props DESTINATION "bin")
|
||||
@@ -1,6 +1,21 @@
|
||||
# copy of displayPanelSimulator for testing with dotMatrixDisplay
|
||||
|
||||
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
else()
|
||||
set(Qt6_Gui "")
|
||||
endif()
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
|
||||
|
||||
SET(displayPanelSimulator_SRCS
|
||||
@@ -38,17 +53,19 @@ NGL_TARGET_INCLUDE_DIRECTORIES(displayPanelSimulator
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(displayPanelSimulator
|
||||
qledline
|
||||
nglapplication
|
||||
nglwidgets
|
||||
NGLLogger
|
||||
nglsettings
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::Widgets
|
||||
Qt6::Network
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(displayPanelSimulator
|
||||
qledline
|
||||
nglapplication
|
||||
nglwidgets
|
||||
NGLLogger
|
||||
nglsettings
|
||||
Qt6::Core
|
||||
${Qt6_Gui}
|
||||
${Qt6_Widgets}
|
||||
Qt6::Network
|
||||
)
|
||||
endif()
|
||||
CONFIGURE_FILE(rheinmetall.jpg ${CMAKE_BINARY_DIR}/rheinmetall.jpg COPYONLY)
|
||||
|
||||
NGL_INSTALL_TARGET_DEVEL(displayPanelSimulator)
|
||||
@@ -9,19 +9,34 @@
|
||||
# Created by Mike Wille, NLE, 2020-01-20
|
||||
#
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
# Note: Qt6::WebSockets stub target exists but doesn't have real implementation
|
||||
# Check for actual QtWebSockets installation by looking for the config file
|
||||
if(QT6_GUI_AVAILABLE AND EXISTS "${Qt6Core_INSTALL_PREFIX}/lib/cmake/Qt6WebSockets/Qt6WebSocketsConfig.cmake")
|
||||
find_package(Qt6WebSockets QUIET)
|
||||
set(EEMFakeServer_ENABLED TRUE)
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
set(EEMFakeServer_ENABLED FALSE)
|
||||
message(WARNING "QtWebSockets not available - EEMFakeServer will not be built")
|
||||
endif()
|
||||
|
||||
|
||||
SET(EEMFakeServer_SRCS
|
||||
main.cpp
|
||||
Server.cpp
|
||||
Server.h
|
||||
)
|
||||
|
||||
NGL_ADD_EXECUTABLE(TOOLSSV NO_TRANSLATION EEMFakeServer ${EEMFakeServer_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(EEMFakeServer
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
Qt6::WebSockets
|
||||
)
|
||||
if(EEMFakeServer_ENABLED)
|
||||
NGL_ADD_EXECUTABLE(TOOLSSV NO_TRANSLATION EEMFakeServer ${EEMFakeServer_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(EEMFakeServer
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
${Qt6_WebSockets}
|
||||
)
|
||||
|
||||
IF(NOT BUILD_RPM)
|
||||
NGL_INSTALL_TARGET(EEMFakeServer)
|
||||
ENDIF()
|
||||
IF(NOT BUILD_RPM)
|
||||
NGL_INSTALL_TARGET(EEMFakeServer)
|
||||
ENDIF()
|
||||
endif()
|
||||
@@ -5,6 +5,14 @@
|
||||
# Created by Malte Schroeder, SLSE, 2016-03-03
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
|
||||
|
||||
SET(lt_SRCS
|
||||
@@ -21,15 +29,17 @@ NGL_WRAP_UI(lt_SRCS ui/mainwindow.ui ui/licenceedit.ui)
|
||||
|
||||
NGL_ADD_EXECUTABLE(WS NO_TRANSLATION LicenceEditor ${lt_SRCS})
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(LicenceEditor
|
||||
Qt6::Widgets
|
||||
Qt6::Core
|
||||
Qt6::Xml
|
||||
nglapplication
|
||||
nglwidgets
|
||||
LtsLicence
|
||||
NGLLogger
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(LicenceEditor
|
||||
${Qt6_Widgets}
|
||||
Qt6::Core
|
||||
Qt6::Xml
|
||||
nglapplication
|
||||
nglwidgets
|
||||
LtsLicence
|
||||
NGLLogger
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET_DEVEL(LicenceEditor)
|
||||
|
||||
@@ -5,6 +5,14 @@
|
||||
# Created by Malte Schroeder, SLSE, 2016-03-03
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
|
||||
|
||||
SET(logView_SRCS
|
||||
@@ -45,12 +53,14 @@ NGL_WRAP_UI(logView_SRCS
|
||||
|
||||
NGL_ADD_EXECUTABLE(TOOLSSV NO_TRANSLATION LogViewer ${logView_SRCS})
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(LogViewer
|
||||
Qt6::Widgets
|
||||
Qt6::Core
|
||||
nglapplication
|
||||
nglwidgets
|
||||
NGLLogger
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(LogViewer
|
||||
${Qt6_Widgets}
|
||||
Qt6::Core
|
||||
nglapplication
|
||||
nglwidgets
|
||||
NGLLogger
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(LogViewer)
|
||||
@@ -6,6 +6,14 @@
|
||||
#
|
||||
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(lt_SRCS
|
||||
login_window.cpp
|
||||
login_window.h
|
||||
@@ -16,13 +24,15 @@ QT5_WRAP_UI(lt_SRCS login_window.ui)
|
||||
|
||||
NGL_ADD_EXECUTABLE(WS LtsLoginTest ${lt_SRCS} main.cpp)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsLoginTest
|
||||
Qt6::Widgets
|
||||
nglapplication
|
||||
nglwidgets
|
||||
LtsWidgets
|
||||
NGLLogger
|
||||
nglsettings
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsLoginTest
|
||||
${Qt6_Widgets}
|
||||
nglapplication
|
||||
nglwidgets
|
||||
LtsWidgets
|
||||
NGLLogger
|
||||
nglsettings
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(LtsLoginTest)
|
||||
@@ -6,6 +6,14 @@
|
||||
# CMakeLists.txt fuer ProjectSettingsEditor
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET (settingsEditor_SRCS
|
||||
function_keys_edit.cpp
|
||||
function_keys_edit.h
|
||||
@@ -25,16 +33,18 @@ QT5_ADD_RESOURCES(settingsEditor_SRCS templates.qrc)
|
||||
NGL_WRAP_UI(settingsEditor_SRCS ${settingsEditor_UICS})
|
||||
NGL_ADD_TOOL_ICON(settingsEditor_SRCS)
|
||||
NGL_ADD_EXECUTABLE(ProjectSettingsEditor TOOLSSV TOOLSWS NO_TRANSLATION ${settingsEditor_SRCS} ${settingsEditor_UICS})
|
||||
NGL_TARGET_LINK_LIBRARIES(ProjectSettingsEditor
|
||||
LtsCommandLineParser
|
||||
LtsPluginLoader
|
||||
StylePluginInterface
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
NGLLogger
|
||||
nglapplication
|
||||
nglwidgets
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(ProjectSettingsEditor
|
||||
LtsCommandLineParser
|
||||
LtsPluginLoader
|
||||
StylePluginInterface
|
||||
Qt6::Core
|
||||
${Qt6_Widgets}
|
||||
NGLLogger
|
||||
nglapplication
|
||||
nglwidgets
|
||||
)
|
||||
endif()
|
||||
|
||||
IF (NOT BUILD_RPM)
|
||||
NGL_INSTALL_TARGET(ProjectSettingsEditor)
|
||||
|
||||
@@ -6,6 +6,14 @@
|
||||
# CMakeLists.txt fuer qledline
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
IF(BUILD_TESTING)
|
||||
ADD_SUBDIRECTORY(Test)
|
||||
ENDIF(BUILD_TESTING)
|
||||
@@ -27,12 +35,14 @@ NGL_TARGET_INCLUDE_DIRECTORIES(qledline
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(qledline
|
||||
PUBLIC
|
||||
qledmatrix
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(qledline
|
||||
PUBLIC
|
||||
qledmatrix
|
||||
Qt6::Core
|
||||
${Qt6_Widgets}
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(qledline)
|
||||
|
||||
@@ -7,6 +7,14 @@
|
||||
#
|
||||
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(qledmatrix_SRCS
|
||||
qledmatrix.cpp
|
||||
)
|
||||
@@ -23,10 +31,12 @@ NGL_TARGET_INCLUDE_DIRECTORIES(qledmatrix
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(qledmatrix
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(qledmatrix
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
${Qt6_Widgets}
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(qledmatrix)
|
||||
@@ -8,6 +8,14 @@
|
||||
# Created by Mike Wille, NLE, 2018-11-11
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
IF(NOT WIN32)
|
||||
SET(ScreenIdShow_SRCS
|
||||
main.cpp
|
||||
@@ -15,9 +23,11 @@ IF(NOT WIN32)
|
||||
|
||||
NGL_ADD_EXECUTABLE(WS ScreenIdShow NO_TRANSLATION ${ScreenIdShow_SRCS})
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(ScreenIdShow
|
||||
Qt6::Widgets
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(ScreenIdShow
|
||||
${Qt6_Widgets}
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(ScreenIdShow)
|
||||
ENDIF(NOT WIN32)
|
||||
@@ -24,7 +24,7 @@ NGL_TARGET_LINK_LIBRARIES(SerialToTcpConverter
|
||||
LtsCommandLineParser
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
Qt6::SerialPort
|
||||
$<IF:$<TARGET_EXISTS:Qt6::SerialPort>,Qt6::SerialPort,>
|
||||
NGLLogger
|
||||
nglapplication
|
||||
nglsettings
|
||||
|
||||
@@ -9,6 +9,14 @@
|
||||
# Created by Mike Wille, NLE, 2019-06-20
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(Splash_SRCS
|
||||
main.cpp
|
||||
Splash.cpp
|
||||
@@ -17,13 +25,15 @@ SET(Splash_SRCS
|
||||
|
||||
NGL_ADD_EXECUTABLE(WS Splash ${Splash_SRCS})
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(Splash
|
||||
Qt6::Widgets
|
||||
LtsPluginManager
|
||||
LtsPluginLoader
|
||||
LtsWidgets # Splash
|
||||
nglapplication
|
||||
NGLLogger
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(Splash
|
||||
${Qt6_Widgets}
|
||||
LtsPluginManager
|
||||
LtsPluginLoader
|
||||
LtsWidgets # Splash
|
||||
nglapplication
|
||||
NGLLogger
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(Splash)
|
||||
@@ -7,6 +7,14 @@
|
||||
# Created by Mike Wille, SLSE, 2016-02-10
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(my_SRCS
|
||||
main.cpp
|
||||
LoginWnd.cpp
|
||||
@@ -43,11 +51,13 @@ NGL_ADD_TOOL_ICON(my_SRCS "sql")
|
||||
NGL_WRAP_UI(my_SRCS ${my_UICS})
|
||||
NGL_ADD_EXECUTABLE(AAR SV WS NO_TRANSLATION sqlbrowser ${my_SRCS} ${my_UICS})
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(sqlbrowser
|
||||
PUBLIC
|
||||
nglapplication
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
Qt6::Sql
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(sqlbrowser
|
||||
PUBLIC
|
||||
nglapplication
|
||||
Qt6::Core
|
||||
${Qt6_Widgets}
|
||||
Qt6::Sql
|
||||
)
|
||||
endif()
|
||||
NGL_INSTALL_TARGET(sqlbrowser)
|
||||
@@ -6,6 +6,21 @@
|
||||
# CMakeLists.txt fuer DdsView
|
||||
#
|
||||
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
else()
|
||||
set(Qt6_Gui "")
|
||||
endif()
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(testEditorTest_SRCS
|
||||
main.cpp
|
||||
textedit.cpp
|
||||
@@ -15,18 +30,20 @@ SET(testEditorTest_SRCS
|
||||
NGL_ADD_TOOL_ICON(testEditorTest_SRCS "dds")
|
||||
|
||||
NGL_ADD_EXECUTABLE(textEditorTest TOOLSWS TOOLSSV NO_TRANSLATION WIN32 ${testEditorTest_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(textEditorTest
|
||||
LtsWidgets
|
||||
nglapplication
|
||||
NGLLogger
|
||||
nglsettings
|
||||
nglwidgets
|
||||
Qt6::Core
|
||||
Qt6::Core5Compat
|
||||
Qt6::Gui
|
||||
Qt6::Widgets
|
||||
Qt6::Xml
|
||||
Qt6::PrintSupport
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(textEditorTest
|
||||
LtsWidgets
|
||||
nglapplication
|
||||
NGLLogger
|
||||
nglsettings
|
||||
nglwidgets
|
||||
Qt6::Core
|
||||
Qt6::Core5Compat
|
||||
${Qt6_Gui}
|
||||
${Qt6_Widgets}
|
||||
Qt6::Xml
|
||||
Qt6::PrintSupport
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(textEditorTest)
|
||||
+16
-6
@@ -1,3 +1,11 @@
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
cmake_minimum_required(VERSION 3.16)
|
||||
project(TrajectoryShader LANGUAGES CXX)
|
||||
|
||||
@@ -20,11 +28,13 @@ qt_add_executable(TrajectoryShader
|
||||
ballistiksimulator.h ballistiksimulator.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(TrajectoryShader
|
||||
PRIVATE
|
||||
Qt6::Widgets
|
||||
Qt6::OpenGLWidgets
|
||||
Qt6::OpenGL
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
target_link_libraries(TrajectoryShader
|
||||
PRIVATE
|
||||
${Qt6_Widgets}
|
||||
Qt6::OpenGLWidgets
|
||||
Qt6::OpenGL
|
||||
)
|
||||
endif()
|
||||
|
||||
qt_finalize_executable(TrajectoryShader)
|
||||
@@ -7,6 +7,14 @@
|
||||
#
|
||||
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(videoimport_SRCS
|
||||
mainwindow.cpp
|
||||
audio_video_widget.cpp
|
||||
@@ -35,17 +43,19 @@ NGL_TARGET_COMPILE_DEFINITIONS(videoimport
|
||||
PRIVATE
|
||||
)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(videoimport
|
||||
PUBLIC
|
||||
$<$<TARGET_EXISTS:PkgConfig::VLC>:PkgConfig::VLC>
|
||||
NGLLogger
|
||||
LtsWidgets
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
LtsPluginLoader
|
||||
StylePluginInterface
|
||||
LtsCommandLineParser
|
||||
nglapplication
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(videoimport
|
||||
PUBLIC
|
||||
$<$<TARGET_EXISTS:PkgConfig::VLC>:PkgConfig::VLC>
|
||||
NGLLogger
|
||||
LtsWidgets
|
||||
Qt6::Core
|
||||
${Qt6_Widgets}
|
||||
LtsPluginLoader
|
||||
StylePluginInterface
|
||||
LtsCommandLineParser
|
||||
nglapplication
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(videoimport)
|
||||
@@ -5,6 +5,14 @@
|
||||
# Created by Hanna Rathje, SLTE, 2022-03-29
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(SRCS
|
||||
main.cpp
|
||||
mainwindow.h
|
||||
@@ -22,21 +30,23 @@ SET(SRCS
|
||||
NGL_WRAP_UI(SRCS mainwindow.ui )
|
||||
|
||||
NGL_ADD_EXECUTABLE(TOOLSSV wlsRandomPositions ${SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(wlsRandomPositions
|
||||
Qt6::Widgets
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
LtsCommandLineParser
|
||||
LtsWidgets
|
||||
ltsCoordWidget
|
||||
LtsCoordTrans
|
||||
LtsUtilsCore
|
||||
SfmConverter
|
||||
nglapplication
|
||||
nglsettings
|
||||
ngltools
|
||||
NGLLogger
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(wlsRandomPositions
|
||||
${Qt6_Widgets}
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
LtsCommandLineParser
|
||||
LtsWidgets
|
||||
ltsCoordWidget
|
||||
LtsCoordTrans
|
||||
LtsUtilsCore
|
||||
SfmConverter
|
||||
nglapplication
|
||||
nglsettings
|
||||
ngltools
|
||||
NGLLogger
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(wlsRandomPositions)
|
||||
NGL_INSTALL(TOOLSSV FILES log4cxx_wrp.props wrp_data.ini DESTINATION bin)
|
||||
|
||||
Reference in new issue
Block a user