Skip to content

Commit

Permalink
Merge pull request #206 from svlad-90/dev/vladyslav-goncharuk/ISSUE-202
Browse files Browse the repository at this point in the history
[ISSUE #202] DMA is not executed on Windows OS
  • Loading branch information
svlad-90 authored Jul 7, 2024
2 parents 0f525c9 + 981c2d7 commit d4eeb53
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 d4eeb53

Please sign in to comment.