[rkward-cvs] SF.net SVN: rkward: [2037] branches/KDE4_port

[tfry at users.sourceforge.net]

Revision: 2037
          http://rkward.svn.sourceforge.net/rkward/?rev=2037&view=rev
Author:   tfry
Date:     2007-10-08 07:48:05 -0700 (Mon, 08 Oct 2007)

Log Message:
-----------
Fix for wrapper script

Modified Paths:
--------------
    branches/KDE4_port/TODO_KDE4
    branches/KDE4_port/rkward/CMakeLists.txt

Modified: branches/KDE4_port/TODO_KDE4
===================================================================
--- branches/KDE4_port/TODO_KDE4	2007-10-08 14:39:08 UTC (rev 2036)
+++ branches/KDE4_port/TODO_KDE4	2007-10-08 14:48:05 UTC (rev 2037)
@@ -5,7 +5,6 @@
 - need to replace hard-coded "share/apps"?
 - icons
 - rkward.desktop
-- syntax definitions
 - KDE3 -> KDE4
 - test
 	- configuration

Modified: branches/KDE4_port/rkward/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/CMakeLists.txt	2007-10-08 14:39:08 UTC (rev 2036)
+++ branches/KDE4_port/rkward/CMakeLists.txt	2007-10-08 14:48:05 UTC (rev 2037)
@@ -39,9 +39,10 @@
 TARGET_LINK_LIBRARIES(rkward.bin ${QT_AND_KDECORE_LIBS} windows agents dialogs plugin settings dataeditor core scriptbackends rbackend misc khtml kmdi kdeui katepartinterfaces )
 
 # wrapper script
+GET_DIRECTORY_PROPERTY(R_HOME DIRECTORY rbackend DEFINITION R_HOME)
 # TODO: somehow this is built unconditionally, but nevermind
 ADD_CUSTOM_TARGET(rkwardwrapper
-	COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/makerkwardscript.pl ${CMAKE_CURRENT_SOURCE_DIR}/rkward.sh.template "${R_HOMEDIR}" > ${CMAKE_CURRENT_BINARY_DIR}/rkward
+	COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/makerkwardscript.pl ${CMAKE_CURRENT_SOURCE_DIR}/rkward.sh.template "${R_HOME}" > ${CMAKE_CURRENT_BINARY_DIR}/rkward
 	DEPENDS makerkwardscript.pl rkward.sh.template
 )
 ADD_DEPENDENCIES(rkward.bin rkwardwrapper)


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