Skip to content

Commit 9947be7

Browse files
authored
Fix Debian Build Plugins Path. (#716)
Signed-off-by: Alexander Wenzel <[email protected]>
1 parent 084dfbc commit 9947be7

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,12 @@ else()
135135
endif()
136136
endif()
137137

138+
if(OVERWRITE_PLUGIN_INSTALLATION_PATH)
139+
set(PLUGIN_INSTALLATION_PATH ${OVERWRITE_PLUGIN_INSTALLATION_PATH})
140+
else()
141+
set(PLUGIN_INSTALLATION_PATH ${DLT_PLUGIN_INSTALLATION_PATH})
142+
endif()
143+
138144
option(DLT_PARSER "Build DLT Parser" OFF)
139145

140146
if(DLT_PARSER)

noble/debian/rules

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ build-stamp:
1919
# Add here commands to compile the package.
2020
cmake . -G Ninja \
2121
-DCMAKE_INSTALL_PREFIX=$(shell pwd)/debian/tmp \
22-
-DDLT_ADDITIONAL_FILES_INSTALLATION_PATH=DLTViewer/usr
22+
-DDLT_ADDITIONAL_FILES_INSTALLATION_PATH=DLTViewer/usr \
23+
-DOVERWRITE_PLUGIN_INSTALLATION_PATH=/usr/share/dlt-viewer/plugins
24+
2325
cmake --build . --parallel $(shell grep -c processor /proc/cpuinfo)
2426
# --- end custom part for compiling
2527

qdlt/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ add_library(qdlt SHARED
5151

5252
target_compile_definitions(qdlt PRIVATE
5353
BYTE_ORDER=LITTLE_ENDIAN
54-
PLUGIN_INSTALLATION_PATH="${DLT_PLUGIN_INSTALLATION_PATH}")
54+
PLUGIN_INSTALLATION_PATH="${PLUGIN_INSTALLATION_PATH}")
5555

5656
if(WIN32)
5757
target_compile_definitions(qdlt PRIVATE QDLT_LIBRARY QT_VIEWER)

0 commit comments

Comments
 (0)