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

[tfry at users.sourceforge.net]

Revision: 2497
          http://rkward.svn.sourceforge.net/rkward/?rev=2497&view=rev
Author:   tfry
Date:     2009-05-22 09:02:39 +0000 (Fri, 22 May 2009)

Log Message:
-----------
Apply some of the patches from the FreeBSD port

Modified Paths:
--------------
    trunk/rkward/rkward/CMakeLists.txt
    trunk/rkward/rkward/rbackend/DetectPthreads.cmake
    trunk/rkward/rkward/rbackend/rthread.cpp

Modified: trunk/rkward/rkward/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/CMakeLists.txt	2009-05-21 20:18:03 UTC (rev 2496)
+++ trunk/rkward/rkward/CMakeLists.txt	2009-05-22 09:02:39 UTC (rev 2497)
@@ -11,7 +11,7 @@
 ADD_SUBDIRECTORY( windows )
 ADD_SUBDIRECTORY( syntax )
 
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${X11_X11_INCLUDE_PATH} )
 
 SET(RKWard_Sources
 	rkward.cpp

Modified: trunk/rkward/rkward/rbackend/DetectPthreads.cmake
===================================================================
--- trunk/rkward/rkward/rbackend/DetectPthreads.cmake	2009-05-21 20:18:03 UTC (rev 2496)
+++ trunk/rkward/rkward/rbackend/DetectPthreads.cmake	2009-05-22 09:02:39 UTC (rev 2497)
@@ -1,7 +1,7 @@
 INCLUDE(CheckIncludeFile)
 INCLUDE(CheckFunctionExists)
 
-CHECK_INCLUDE_FILE(phthread_np.h HAVE_PTHREAD_NP_H)
+CHECK_INCLUDE_FILE(pthread_np.h HAVE_PTHREAD_NP_H)
 
 SET (CMAKE_REQUIRED_FLAGS ${CMAKE_THREAD_LIBS_INIT})
 CHECK_FUNCTION_EXISTS (pthread_getattr_np HAVE_PTHREAD_GETATTR_NP)
@@ -9,4 +9,4 @@
 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
+CONFIGURE_FILE(pthread_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/pthread_config.h)

Modified: trunk/rkward/rkward/rbackend/rthread.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rthread.cpp	2009-05-21 20:18:03 UTC (rev 2496)
+++ trunk/rkward/rkward/rbackend/rthread.cpp	2009-05-22 09:02:39 UTC (rev 2497)
@@ -34,6 +34,7 @@
 #include <QList>
 
 #include <signal.h>		// needed for pthread_kill
+#include <pthread.h>		// seems to be needed at least on FreeBSD
 
 #define MAX_BUF_LENGTH 4000
 


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