[rkward-cvs] SF.net SVN: rkward: [2030] branches/KDE4_port/rkward
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Mon Oct 8 10:34:09 UTC 2007
Revision: 2030
http://rkward.svn.sourceforge.net/rkward/?rev=2030&view=rev
Author: tfry
Date: 2007-10-08 03:34:09 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
CMake progress
Modified Paths:
--------------
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
branches/KDE4_port/rkward/rbackend/rkpthreadsupport.cpp
branches/KDE4_port/rkward/windows/qxembedcopy.cpp
Added Paths:
-----------
branches/KDE4_port/rkward/rbackend/pthread_config.h.cmake
Modified: branches/KDE4_port/rkward/main.cpp
===================================================================
--- branches/KDE4_port/rkward/main.cpp 2007-10-08 09:39:24 UTC (rev 2029)
+++ branches/KDE4_port/rkward/main.cpp 2007-10-08 10:34:09 UTC (rev 2030)
@@ -61,7 +61,7 @@
#include "config.h"
-#include "debug.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 09:39:24 UTC (rev 2029)
+++ branches/KDE4_port/rkward/rbackend/CMakeLists.txt 2007-10-08 10:34:09 UTC (rev 2030)
@@ -22,8 +22,8 @@
KDE3_AUTOMOC(${rbackend_STAT_SRCS})
ADD_LIBRARY(rbackend STATIC ${rbackend_STAT_SRCS})
+TARGET_LINK_LIBRARIES(rbackend ${R_USED_LIBS})
-
########### install files ###############
Modified: branches/KDE4_port/rkward/rbackend/DetectPthreads.cmake
===================================================================
--- branches/KDE4_port/rkward/rbackend/DetectPthreads.cmake 2007-10-08 09:39:24 UTC (rev 2029)
+++ branches/KDE4_port/rkward/rbackend/DetectPthreads.cmake 2007-10-08 10:34:09 UTC (rev 2030)
@@ -1,13 +1,13 @@
# TODO!
+INCLUDE(CheckIncludeFile)
+INCLUDE(CheckLibraryExists)
-# dnl check for pthread stack limit getting functions
-# AC_DEFUN([CHECK_PTHREAD_FLAVOR],
-# [
-# ac_check_pthread_flavor_save_LIBS="$LIBS"
-# LIBS="$LIBS $LIBPTHREAD"
-# AC_CHECK_HEADERS([pthread_np.h])
-# AC_CHECK_FUNCS([pthread_getattr_np pthread_attr_get_np pthread_get_stacksize_np pthread_get_stackaddr_np])
-# LIBS="$ac_check_pthread_flavor_save_LIBS"])
-# ])
-#
-#
+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)
+
+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 09:39:24 UTC (rev 2029)
+++ branches/KDE4_port/rkward/rbackend/FindR.cmake 2007-10-08 10:34:09 UTC (rev 2030)
@@ -55,7 +55,7 @@
MESSAGE(STATUS "Found at ${R_H}")
GET_FILENAME_COMPONENT(R_INCLUDEDIR ${R_H}
PATH)
- SET(R_INCLUDEFLAG -I${R_INCLUDEDIR})
+ INCLUDE_DIRECTORIES(${R_INCLUDEDIR})
ENDIF(NOT R_H)
# check for existence of libR.so
@@ -71,7 +71,8 @@
MESSAGE(STATUS "Exists at ${LIBR_SO}")
GET_FILENAME_COMPONENT(R_SHAREDLIBDIR ${LIBR_SO}
PATH)
- SET(R_SHAREDLIBFLAG -L${R_SHAREDLIBDIR} -lR)
+ LINK_DIRECTORIES(${R_SHAREDLIBDIR})
+ SET(R_USED_LIBS R)
ENDIF(NOT LIBR_SO)
# for at least some versions of R, we seem to have to link against -lRlapack. Else loading some
@@ -81,13 +82,13 @@
MESSAGE(STATUS "Checking whether we should link against libRlapack.so")
FIND_FILE(LIBR_LAPACK
libRlapack.so
- PATHS ${R_LIBDIR}
+ PATHS ${R_SHAREDLIBDIR}
NO_DEFAULT_PATH)
IF(NOT LIBR_LAPACK)
- MESSAGE(STATUS "No, ${R_LIBDIR}/libRlapack.so does not exist")
+ MESSAGE(STATUS "No, ${R_SHAREDLIBDIR}/libRlapack.so does not exist")
ELSE(NOT LIBR_LAPACK)
MESSAGE(STATUS "Yes, ${LIBR_LAPACK} exists")
- SET(R_LIBADDS ${R_LIBADDS} -lRlapack -lgfortran)
+ SET(R_USED_LIBS ${R_USED_LIBS} Rlapack gfortran)
ENDIF(NOT LIBR_LAPACK)
# for at least some versions of R, we seem to have to link against -lRblas. Else loading some
@@ -97,13 +98,13 @@
MESSAGE(STATUS "Checking whether we should link against libRblas.so")
FIND_FILE(LIBR_BLAS
libRblas.so
- PATHS ${R_LIBDIR}
+ PATHS ${R_SHAREDLIBDIR}
NO_DEFAULT_PATH)
IF(NOT LIBR_BLAS)
- MESSAGE(STATUS "No, ${R_LIBDIR}/libRblas.so does not exist")
+ MESSAGE(STATUS "No, ${R_SHAREDLIBDIR}/libRblas.so does not exist")
ELSE(NOT LIBR_BLAS)
MESSAGE(STATUS "Yes, ${LIBR_BLAS} exists")
- SET(R_LIBADDS ${R_LIBADDS} -lRblas)
+ SET(R_USED_LIBS ${R_USED_LIBS} Rblas)
ENDIF(NOT LIBR_BLAS)
@@ -134,3 +135,4 @@
ENDIF(NOT EXISTS ${R_LIBDIR})
MESSAGE(STATUS "Will use ${R_LIBDIR}")
ENDIF(NOT EXISTS ${R_LIBDIR})
+
Added: branches/KDE4_port/rkward/rbackend/pthread_config.h.cmake
===================================================================
--- branches/KDE4_port/rkward/rbackend/pthread_config.h.cmake (rev 0)
+++ branches/KDE4_port/rkward/rbackend/pthread_config.h.cmake 2007-10-08 10:34:09 UTC (rev 2030)
@@ -0,0 +1,5 @@
+#cmakedefine HAVE_PTHREAD_NP_H
+#cmakedefine HAVE_PTHREAD_GETATTR_NP
+#cmakedefine HAVE_PTHREAD_ATTR_GET_NP
+#cmakedefine HAVE_PTHREAD_GET_STACKSIZE_NP
+#cmakedefine HAVE_PTHREAD_GET_STACKADDR_NP
Modified: branches/KDE4_port/rkward/rbackend/rkpthreadsupport.cpp
===================================================================
--- branches/KDE4_port/rkward/rbackend/rkpthreadsupport.cpp 2007-10-08 09:39:24 UTC (rev 2029)
+++ branches/KDE4_port/rkward/rbackend/rkpthreadsupport.cpp 2007-10-08 10:34:09 UTC (rev 2030)
@@ -17,7 +17,7 @@
#include "rkpthreadsupport.h"
-#include "../../config.h"
+#include "pthread_config.h"
#include <qstring.h>
#include "../debug.h"
Modified: branches/KDE4_port/rkward/windows/qxembedcopy.cpp
===================================================================
--- branches/KDE4_port/rkward/windows/qxembedcopy.cpp 2007-10-08 09:39:24 UTC (rev 2029)
+++ branches/KDE4_port/rkward/windows/qxembedcopy.cpp 2007-10-08 10:34:09 UTC (rev 2030)
@@ -67,7 +67,7 @@
# include <kxerrorhandler.h>
// L0002: Is file config.h KDE specific?
-# include <config.h>
+//# include <config.h>
# ifdef HAVE_UNISTD_H
# include <unistd.h>
# ifdef HAVE_USLEEP
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list