[education/rkward] rkward: Fix libexec path
Thomas Friedrichsmeier
null at kde.org
Sat Apr 13 09:26:52 BST 2024
Git commit bb743f50b613ce4583eaa60129b2da913d454b69 by Thomas Friedrichsmeier.
Committed on 13/04/2024 at 08:26.
Pushed by tfry into branch 'master'.
Fix libexec path
M +1 -1 rkward/dialogs/CMakeLists.txt
M +2 -2 rkward/rbackend/CMakeLists.txt
https://invent.kde.org/education/rkward/-/commit/bb743f50b613ce4583eaa60129b2da913d454b69
diff --git a/rkward/dialogs/CMakeLists.txt b/rkward/dialogs/CMakeLists.txt
index 017be1b4f..ebd185e76 100644
--- a/rkward/dialogs/CMakeLists.txt
+++ b/rkward/dialogs/CMakeLists.txt
@@ -15,6 +15,6 @@ SET(dialogs_STAT_SRCS
rksetupwizard.cpp
)
-ADD_DEFINITIONS(-DLIBEXECDIR="${CMAKE_INSTALL_FULL_LIBEXECDIR}")
+ADD_DEFINITIONS(-DLIBEXECDIR="${KDE_INSTALL_LIBEXECDIR}")
ADD_LIBRARY(dialogs STATIC ${dialogs_STAT_SRCS})
TARGET_LINK_LIBRARIES(dialogs Qt6::Widgets KF6::Parts KF6::ConfigWidgets KF6::TextEditor KF6::I18n)
diff --git a/rkward/rbackend/CMakeLists.txt b/rkward/rbackend/CMakeLists.txt
index 057adb793..316e68ce7 100644
--- a/rkward/rbackend/CMakeLists.txt
+++ b/rkward/rbackend/CMakeLists.txt
@@ -77,7 +77,7 @@ ENDIF(MSVC)
IF(WIN32)
# on Widows, we install to the rbackend subdirectory, because 1) LIBEXEC_INSTALL_DIR == BIN_INSTALL_DIR and 2) we don't want the backend to pick up
# all the KDE library versions, first, when loading DLLs
- INSTALL(TARGETS rkward.rbackend DESTINATION ${BIN_INSTALL_DIR}/rbackend)
+ INSTALL(TARGETS rkward.rbackend DESTINATION ${KDE_INSTALL_BINDIR}/rbackend)
ELSE(WIN32)
- INSTALL(TARGETS rkward.rbackend DESTINATION ${LIBEXEC_INSTALL_DIR})
+ INSTALL(TARGETS rkward.rbackend DESTINATION ${KDE_INSTALL_LIBEXECDIR})
ENDIF(WIN32)
More information about the rkward-tracker
mailing list