Skip to content

Commit

Permalink
[ISSUE #202] DMA is not executed on Windows OS
Browse files Browse the repository at this point in the history
This patch slightly modifies the artifacts installation rules for the
Windows OS to ensure sucessful execution of the DLT Message Analyzer
plugin from within the 'DltViewerSDKQt6' or 'DltViewerSDKQt5' folder.

Signed-off-by: Vladayslav Goncharuk <[email protected]>
  • Loading branch information
Vladayslav Goncharuk authored and Vladayslav Goncharuk committed Jul 7, 2024
1 parent 89a8df1 commit c738669
Showing 1 changed file with 28 additions and 1 deletion.
29 changes: 28 additions & 1 deletion dltmessageanalyzerplugin/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,14 @@ DMA_sync_g_test_framework()
DMA_sync_plantuml()
DMA_sync_framework()
DMA_sync_q_custom_plot()
install(TARGETS qcustomplot LIBRARY DESTINATION ${DLT_LIBRARY_INSTALLATION_PATH} )
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
install(TARGETS qcustomplot LIBRARY DESTINATION ${DLT_LIBRARY_INSTALLATION_PATH} )
elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
install(TARGETS qcustomplot RUNTIME DESTINATION ${DLT_EXECUTABLE_INSTALLATION_PATH} )
elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
install(TARGETS qcustomplot LIBRARY DESTINATION ${DLT_LIBRARY_INSTALLATION_PATH} )
endif()

################### DEPENDENCIES ( END )###################

################### COMPATIBILITY #########################
Expand Down Expand Up @@ -191,4 +198,24 @@ add_custom_command(TARGET DLT-Message-Analyzer POST_BUILD
target_link_libraries(DLT-Message-Analyzer qdlt ${QT_PREFIX}::Widgets )
################### QT ( END ) ############################

########## ENSURE INSTALLATION OF QT DEPENDENCIES #########
if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
# used by the DLT Message Analyzer itself
find_package(${QT_PREFIX} REQUIRED COMPONENTS Svg)
# used by qcustomplot
find_package(${QT_PREFIX} REQUIRED COMPONENTS PrintSupport)
set(QT_LIBS
${QT_PREFIX}::Svg
${QT_PREFIX}::PrintSupport)

foreach(QT_LIB IN ITEMS ${QT_LIBS})
get_target_property(LIBRARY_PATH ${QT_LIB} LOCATION)
install(FILES
"${LIBRARY_PATH}"
DESTINATION "${DLT_EXECUTABLE_INSTALLATION_PATH}"
COMPONENT qt_libraries)
endforeach()
endif()
####### ENSURE INSTALLATION OF QT DEPENDENCIES ( END ) ####

add_plugin(DLT-Message-Analyzer)

0 comments on commit c738669

Please sign in to comment.