Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE #202] DMA is not executed on Windows OS #205

Closed
wants to merge 1 commit into from
Closed

[ISSUE #202] DMA is not executed on Windows OS #205

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion dltmessageanalyzerplugin/src/CMakeLists.txt
View file
Open in desktop
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)
Loading