[rkward/frameworks] /: Syntax highlighting files are installed to a different directory (by default) since 5.28.0

[Thomas Friedrichsmeier]

Git commit 6dc4aed405d43d55b0fef3800b52ed6c1a5e2c7f by Thomas Friedrichsmeier.
Committed on 08/06/2017 at 14:00.
Pushed by tfry into branch 'frameworks'.

Syntax highlighting files are installed to a different directory (by default) since 5.28.0

M  +0    -2    ChangeLog
M  +8    -2    rkward/syntax/CMakeLists.txt

https://commits.kde.org/rkward/6dc4aed405d43d55b0fef3800b52ed6c1a5e2c7f

diff --git a/ChangeLog b/ChangeLog
index 04c36fa8..e2900b48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,3 @@
-TODO: Location of syntax highlighting definitions has changed in KF 5.28.0 does this affect us (R console highlighting)?
-
 - Fixed: Creating trellis on-screen plots, while package lattice is not on the search path would produce errors in plot history mechanism
 - Limit the number of debug log-files to keep (at most three, each, for frontend and backend)
 - Remove Windows-only UI for setInternet2()-option (no longer available in R, with setInternet2(TRUE) the default since R 3.2.2)
diff --git a/rkward/syntax/CMakeLists.txt b/rkward/syntax/CMakeLists.txt
index 6db8bab7..80f14b6a 100644
--- a/rkward/syntax/CMakeLists.txt
+++ b/rkward/syntax/CMakeLists.txt
@@ -1,5 +1,11 @@
-INSTALL(FILES rkward.xml DESTINATION ${DATA_INSTALL_DIR}/katepart5/syntax/)
+IF(${KF5_VERSION} VERSION_GREATER "5.27.9")
+    SET(SYNTAX_DEST ${DATA_INSTALL_DIR}/org.kde.syntax-highlighting/syntax/)
+ELSE(${KF5_VERSION} VERSION_GREATER "5.27.9")
+    SET(SYNTAX_DEST ${DATA_INSTALL_DIR}/katepart5/syntax/)
+ENDIF(${KF5_VERSION} VERSION_GREATER "5.27.9")
+
+INSTALL(FILES rkward.xml DESTINATION ${SYNTAX_DEST})
 
 IF(NOT NO_R_XML)
-	INSTALL(FILES r.xml DESTINATION ${DATA_INSTALL_DIR}/katepart5/syntax/)
+	INSTALL(FILES r.xml DESTINATION ${SYNTAX_DEST})
 ENDIF(NOT NO_R_XML)