[rkward-cvs] SF.net SVN: rkward:[4050] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 4050
          http://rkward.svn.sourceforge.net/rkward/?rev=4050&view=rev
Author:   tfry
Date:     2011-11-24 18:54:27 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
Add cmake switch to skip installation of r.xml

Modified Paths:
--------------
    trunk/rkward/INSTALL
    trunk/rkward/rkward/syntax/CMakeLists.txt

Modified: trunk/rkward/INSTALL
===================================================================
--- trunk/rkward/INSTALL	2011-11-24 11:02:05 UTC (rev 4049)
+++ trunk/rkward/INSTALL	2011-11-24 18:54:27 UTC (rev 4050)
@@ -43,6 +43,9 @@
 	R home directory. Almost certainly this option is not needed.
 -DR_INCLUDEDIR
 	path to R include files. Almost certainly this option is not needed.
+-DNO_R_XML
+	When packaging RKWard for binary distribution, it may be necessary to exclude the R syntax highlighting defintion "r.xml"
+	from installation, as it may already be provided other packages. In this case, you can use: -DNO_R_XML=1
 
 Further generic options are listed on http://www.cmake.org/Wiki/CMake_Useful_Variables .
 

Modified: trunk/rkward/rkward/syntax/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/syntax/CMakeLists.txt	2011-11-24 11:02:05 UTC (rev 4049)
+++ trunk/rkward/rkward/syntax/CMakeLists.txt	2011-11-24 18:54:27 UTC (rev 4050)
@@ -1,8 +1,5 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
+INSTALL(FILES rkward.xml DESTINATION ${DATA_INSTALL_DIR}/katepart/syntax/)
 
-
-########### install files ###############
-
-INSTALL(FILES   r.xml rkward.xml DESTINATION ${DATA_INSTALL_DIR}/katepart/syntax/ )
-
-# r-syntax-test.R is not installed
+IF(NOT NO_R_XML)
+	INSTALL(FILES r.xml DESTINATION ${DATA_INSTALL_DIR}/katepart/syntax/)
+ENDIF(NOT NO_R_XML)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.