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

[tfry at users.sourceforge.net]

Revision: 2032
          http://rkward.svn.sourceforge.net/rkward/?rev=2032&view=rev
Author:   tfry
Date:     2007-10-08 06:26:58 -0700 (Mon, 08 Oct 2007)

Log Message:
-----------
Building/installing the R package works

Modified Paths:
--------------
    branches/KDE4_port/rkward/rbackend/CMakeLists.txt
    branches/KDE4_port/rkward/rbackend/DetectPthreads.cmake
    branches/KDE4_port/rkward/rbackend/rpackages/CMakeLists.txt

Added Paths:
-----------
    branches/KDE4_port/rkward/rbackend/rpackages/rpackage_install.cmake.in

Modified: branches/KDE4_port/rkward/rbackend/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/rbackend/CMakeLists.txt	2007-10-08 11:30:50 UTC (rev 2031)
+++ branches/KDE4_port/rkward/rbackend/CMakeLists.txt	2007-10-08 13:26:58 UTC (rev 2032)
@@ -1,3 +1,6 @@
+INCLUDE(FindR.cmake)
+INCLUDE(DetectPthreads.cmake)
+
 ADD_SUBDIRECTORY( rpackages ) 
 
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  )
@@ -2,5 +5,2 @@
 
-INCLUDE(FindR.cmake)
-INCLUDE(DetectPthreads.cmake)
-
 ########### next target ###############
@@ -25,24 +25,3 @@
 TARGET_LINK_LIBRARIES(rbackend ${R_USED_LIBS})
 LINK_DIRECTORIES(${R_SHAREDLIBDIR})
 INCLUDE_DIRECTORIES(${R_INCLUDEDIR})
-
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-#INCLUDES = $(all_includes)
-#METASOURCES = AUTO
-#
-#AM_CPPFLAGS = -I$(R_INCLUDEDIR)
-#
-#noinst_LIBRARIES =  librbackend.a
-#librbackend_a_SOURCES = rembedinternal.cpp rinterface.cpp rthread.cpp rcommand.cpp rcommandreceiver.cpp rcommandstack.cpp \
-#rdata.cpp rkpthreadsupport.cpp rklocalesupport.cpp
-#noinst_HEADERS = rembedinternal.h rinterface.h rthread.h rcommand.h rcommandreceiver.h rcommandstack.h \
-#rdata.h rkpthreadsupport.h rklocalesupport.h
-#SUBDIRS =  rpackages
-#
-#rembedinternal.o: rkstructuregetter.cpp
\ No newline at end of file

Modified: branches/KDE4_port/rkward/rbackend/DetectPthreads.cmake
===================================================================
--- branches/KDE4_port/rkward/rbackend/DetectPthreads.cmake	2007-10-08 11:30:50 UTC (rev 2031)
+++ branches/KDE4_port/rkward/rbackend/DetectPthreads.cmake	2007-10-08 13:26:58 UTC (rev 2032)
@@ -1,4 +1,3 @@
-# TODO!
 INCLUDE(CheckIncludeFile)
 INCLUDE(CheckFunctionExists)
 

Modified: branches/KDE4_port/rkward/rbackend/rpackages/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/rbackend/rpackages/CMakeLists.txt	2007-10-08 11:30:50 UTC (rev 2031)
+++ branches/KDE4_port/rkward/rbackend/rpackages/CMakeLists.txt	2007-10-08 13:26:58 UTC (rev 2032)
@@ -2,30 +2,10 @@
 
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  )
 
+CONFIGURE_FILE(
+	"${CMAKE_CURRENT_SOURCE_DIR}/rpackage_install.cmake.in"
+	"${CMAKE_CURRENT_BINARY_DIR}/rpackage_install.cmake"
+	@ONLY)
 
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-#SUBDIRS = rkward
-#
-#all:
-#	-${R_HOMEDIR}/bin/R CMD build rkward
-#install:
-#	-mkdir -p tmp ; \
-#	OLDTMP=$$TMPDIR ; \
-#	export TMPDIR=`pwd`/tmp ; \
-#	mkdir -p $(DESTDIR)/$(R_LIBDIR) ; \
-#	${R_HOMEDIR}/bin/R CMD INSTALL -l $(DESTDIR)/$(R_LIBDIR) rkward ; \
-#	export TMPDIR=$$OLDTMP
-#uninstall:
-#	-${R_HOMEDIR}/bin/R CMD REMOVE -l $(DESTDIR)/$(R_LIBDIR) rkward
-#check:
-#	-${R_HOMEDIR}/bin/R CMD check rkward
-#clean \
-#distclean:
-#	-rm -f rkward_*.tar.gz
-#	-rm -rf tmp
+INSTALL(CODE "EXEC_PROGRAM(\"export DESTDIR=${DESTDIR}\")")
+INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/rpackage_install.cmake -DDESTDIR=${DESTDIR})

Added: branches/KDE4_port/rkward/rbackend/rpackages/rpackage_install.cmake.in
===================================================================
--- branches/KDE4_port/rkward/rbackend/rpackages/rpackage_install.cmake.in	                        (rev 0)
+++ branches/KDE4_port/rkward/rbackend/rpackages/rpackage_install.cmake.in	2007-10-08 13:26:58 UTC (rev 2032)
@@ -0,0 +1,8 @@
+SET(DESTDIR $ENV{DESTDIR})
+
+MESSAGE(STATUS "Installing R support package")
+
+EXEC_PROGRAM("mkdir -p @CMAKE_CURRENT_BINARY_DIR@/tmp
+	mkdir -p ${DESTDIR}/@R_LIBDIR@
+	TMPDIR=@CMAKE_CURRENT_BINARY_DIR@/tmp @R_EXECUTABLE@ CMD INSTALL -l ${DESTDIR}/@R_LIBDIR@ @CMAKE_CURRENT_SOURCE_DIR@/rkward" @CMAKE_CURRENT_BINARY_DIR@
+)
\ No newline at end of file


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