[rkward/work/frameworks-Mac] rkward: Use KDE_INSTALL_FULL_LIBEXECDIR

René J.V. Bertin null at kde.org
Wed May 17 21:01:54 UTC 2017


Git commit dd9ee8aefb568dac371cfcf04fbf8edb4c3e2a66 by René J.V. Bertin.
Committed on 17/05/2017 at 20:58.
Pushed by rjvbb into branch 'work/frameworks-Mac'.

Use KDE_INSTALL_FULL_LIBEXECDIR

KDE_INSTALL_LIBEXECDIR contains the same path on Mac but not elsewhere.

M  +1    -1    rkward/CMakeLists.txt
M  +1    -1    rkward/rbackend/CMakeLists.txt

https://commits.kde.org/rkward/dd9ee8aefb568dac371cfcf04fbf8edb4c3e2a66

diff --git a/rkward/CMakeLists.txt b/rkward/CMakeLists.txt
index 03a0b1b4..767a0447 100755
--- a/rkward/CMakeLists.txt
+++ b/rkward/CMakeLists.txt
@@ -9,7 +9,7 @@ IF(APPLE)
     SET(CPACK_BUNDLE_NAME RKWard)
     SET(CPACK_BUNDLE_STARTUP_COMMAND rkward)
 ENDIF()
-SET(RKWARD_FRONTEND_LOCATION ${KDE_INSTALL_LIBEXECDIR})
+SET(RKWARD_FRONTEND_LOCATION ${KDE_INSTALL_FULL_LIBEXECDIR})
 # once tested and working this could become the default on Mac:
 OPTION(APPLE_STANDALONE_BUNDLE "Generate a standalone app bundle when building on Mac" OFF)
 ADD_FEATURE_INFO("App Bundle" APPLE_STANDALONE_BUNDLE "Generate a standalone app bundle when building on Mac. Do not use for now.")
diff --git a/rkward/rbackend/CMakeLists.txt b/rkward/rbackend/CMakeLists.txt
index 2720b16a..8a9c9ca4 100644
--- a/rkward/rbackend/CMakeLists.txt
+++ b/rkward/rbackend/CMakeLists.txt
@@ -54,7 +54,7 @@ SET (
 	rktransmitter.cpp
 )
 ADD_DEFINITIONS (-DRKWARD_SPLIT_PROCESS)
-ADD_DEFINITIONS (-DRKWARD_BACKEND_PATH="${KDE_INSTALL_LIBEXECDIR}")
+ADD_DEFINITIONS (-DRKWARD_BACKEND_PATH="${KDE_INSTALL_FULL_LIBEXECDIR}")
 LINK_DIRECTORIES(${R_SHAREDLIBDIR})
 ADD_EXECUTABLE(rkward.rbackend ${rbackend_BACKEND_SRCS})
 ECM_MARK_NONGUI_EXECUTABLE(rkward.rbackend)



More information about the rkward-tracker mailing list