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

[tfry at users.sourceforge.net]

Revision: 2031
          http://rkward.svn.sourceforge.net/rkward/?rev=2031&view=rev
Author:   tfry
Date:     2007-10-08 04:30:50 -0700 (Mon, 08 Oct 2007)

Log Message:
-----------
CMake porting: Most things build, now

Modified Paths:
--------------
    branches/KDE4_port/rkward/CMakeLists.txt
    branches/KDE4_port/rkward/main.cpp
    branches/KDE4_port/rkward/rbackend/CMakeLists.txt
    branches/KDE4_port/rkward/rbackend/DetectPthreads.cmake
    branches/KDE4_port/rkward/rbackend/FindR.cmake

Modified: branches/KDE4_port/rkward/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/CMakeLists.txt	2007-10-08 10:34:09 UTC (rev 2030)
+++ branches/KDE4_port/rkward/CMakeLists.txt	2007-10-08 11:30:50 UTC (rev 2031)
@@ -16,31 +16,31 @@
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  )
 
 SET(RKWard_Sources
-  rkward.cpp
-  main.cpp
-  rkglobals.cpp
-  robjectbrowser.cpp
-  robjectviewer.cpp
-  rkconsole.cpp
-  rkwardapplication.cpp
+	rkward.cpp
+	main.cpp
+	rkglobals.cpp
+	robjectbrowser.cpp
+	robjectviewer.cpp
+	rkconsole.cpp
+	rkwardapplication.cpp
 )
-  
 
 ########### next target ###############
 
-
+# auto-gen sources
 KDE3_AUTOMOC(${RKWard_Sources})
+KDE3_ADD_DCOP_SKELS(RKWard_Sources rkward.h)
 
-SET( RKWard_DCOP_SKEL_SRCS
-   rkward.h
-   )
 
-KDE3_ADD_DCOP_SKELS(RKWard_Sources ${RKWard_DCOP_SKEL_SRCS})
+# somehow the needed libdirs for R do not get passed down automatically
+GET_DIRECTORY_PROPERTY(R_SHAREDLIBDIR DIRECTORY rbackend LINK_DIRECTORIES)
+LINK_DIRECTORIES(${R_SHAREDLIBDIR})
 
 KDE3_ADD_EXECUTABLE(rkward.bin ${RKWard_Sources})
 
-TARGET_LINK_LIBRARIES(rkward.bin ${QT_AND_KDECORE_LIBS} windows agents dialogs plugin settings dataeditor core rbackend scriptbackends misc khtml kmdi kdeui R katepartinterfaces )
+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
 ADD_CUSTOM_COMMAND(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/rkward
    COMMAND perl ./makerkwardscript.pl rkward.sh.template "$(R_HOMEDIR)" > rkward; ${CMAKE_CURRENT_BINARY_DIR}/rkward

Modified: branches/KDE4_port/rkward/main.cpp
===================================================================
--- branches/KDE4_port/rkward/main.cpp	2007-10-08 10:34:09 UTC (rev 2030)
+++ branches/KDE4_port/rkward/main.cpp	2007-10-08 11:30:50 UTC (rev 2031)
@@ -59,9 +59,9 @@
 #include "rkward.h"
 #include "rkwardapplication.h"
 
-#include "config.h"
+#include "debug.h"
 
-#include "version.h"
+#include "../version.h"
 
 int RK_Debug_Level = 0;
 int RK_Debug_Flags = ALL;

Modified: branches/KDE4_port/rkward/rbackend/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/rbackend/CMakeLists.txt	2007-10-08 10:34:09 UTC (rev 2030)
+++ branches/KDE4_port/rkward/rbackend/CMakeLists.txt	2007-10-08 11:30:50 UTC (rev 2031)
@@ -23,6 +23,8 @@
 
 ADD_LIBRARY(rbackend STATIC ${rbackend_STAT_SRCS})
 TARGET_LINK_LIBRARIES(rbackend ${R_USED_LIBS})
+LINK_DIRECTORIES(${R_SHAREDLIBDIR})
+INCLUDE_DIRECTORIES(${R_INCLUDEDIR})
 
 ########### install files ###############
 

Modified: branches/KDE4_port/rkward/rbackend/DetectPthreads.cmake
===================================================================
--- branches/KDE4_port/rkward/rbackend/DetectPthreads.cmake	2007-10-08 10:34:09 UTC (rev 2030)
+++ branches/KDE4_port/rkward/rbackend/DetectPthreads.cmake	2007-10-08 11:30:50 UTC (rev 2031)
@@ -1,13 +1,13 @@
 # TODO!
 INCLUDE(CheckIncludeFile)
-INCLUDE(CheckLibraryExists)
+INCLUDE(CheckFunctionExists)
 
 CHECK_INCLUDE_FILE(phthread_np.h HAVE_PTHREAD_NP_H)
 
 SET (CMAKE_REQUIRED_FLAGS ${CMAKE_THREAD_LIBS_INIT})
-CHECK_LIBRARY_EXISTS ("" pthread_getattr_np "" HAVE_PTHREAD_GETATTR_NP)
-CHECK_LIBRARY_EXISTS ("" pthread_attr_get_np "" HAVE_PTHREAD_ATTR_GET_NP)
-CHECK_LIBRARY_EXISTS ("" pthread_get_stacksize_np "" HAVE_PTHREAD_GET_STACKSIZE_NP)
-CHECK_LIBRARY_EXISTS ("" pthread_get_stackaddr_np "" HAVE_PTHREAD_GET_STACKADDR_NP)
+CHECK_FUNCTION_EXISTS (pthread_getattr_np HAVE_PTHREAD_GETATTR_NP)
+CHECK_FUNCTION_EXISTS (pthread_attr_get_np HAVE_PTHREAD_ATTR_GET_NP)
+CHECK_FUNCTION_EXISTS (pthread_get_stacksize_np HAVE_PTHREAD_GET_STACKSIZE_NP)
+CHECK_FUNCTION_EXISTS (pthread_get_stackaddr_np HAVE_PTHREAD_GET_STACKADDR_NP)
 
 CONFIGURE_FILE(pthread_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/pthread_config.h)
\ No newline at end of file

Modified: branches/KDE4_port/rkward/rbackend/FindR.cmake
===================================================================
--- branches/KDE4_port/rkward/rbackend/FindR.cmake	2007-10-08 10:34:09 UTC (rev 2030)
+++ branches/KDE4_port/rkward/rbackend/FindR.cmake	2007-10-08 11:30:50 UTC (rev 2031)
@@ -55,7 +55,6 @@
 	MESSAGE(STATUS "Found at ${R_H}")
 	GET_FILENAME_COMPONENT(R_INCLUDEDIR ${R_H}
 				PATH)
-	INCLUDE_DIRECTORIES(${R_INCLUDEDIR})
 ENDIF(NOT R_H)
 
 # check for existence of libR.so
@@ -71,7 +70,6 @@
 	MESSAGE(STATUS "Exists at ${LIBR_SO}")
 	GET_FILENAME_COMPONENT(R_SHAREDLIBDIR ${LIBR_SO}
 				PATH)
-	LINK_DIRECTORIES(${R_SHAREDLIBDIR})
 	SET(R_USED_LIBS R)
 ENDIF(NOT LIBR_SO)
 


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