[rkward-cvs] SF.net SVN: rkward:[2810] trunk/rkward/rkward/rbackend/CMakeLists.txt

[tfry at users.sourceforge.net]

Revision: 2810
          http://rkward.svn.sourceforge.net/rkward/?rev=2810&view=rev
Author:   tfry
Date:     2010-04-15 12:57:15 +0000 (Thu, 15 Apr 2010)

Log Message:
-----------
Link against pthreads, explicitely (if available). See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=556321

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/CMakeLists.txt

Modified: trunk/rkward/rkward/rbackend/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/rbackend/CMakeLists.txt	2010-03-23 17:47:59 UTC (rev 2809)
+++ trunk/rkward/rkward/rbackend/CMakeLists.txt	2010-04-15 12:57:15 UTC (rev 2810)
@@ -1,7 +1,10 @@
 INCLUDE(FindR.cmake)
-INCLUDE(DetectPthreads.cmake)
+IF(NOT WIN32)
+	FIND_PACKAGE(Threads)
+	INCLUDE(DetectPthreads.cmake)
+ENDIF(NOT WIN32)
 
-ADD_SUBDIRECTORY( rpackages ) 
+ADD_SUBDIRECTORY( rpackages )
 
 INCLUDE_DIRECTORIES( ${R_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
 
@@ -24,6 +27,6 @@
 
 QT4_AUTOMOC(${rbackend_STAT_SRCS})
 
-ADD_LIBRARY(rbackend STATIC ${rbackend_STAT_SRCS})
-TARGET_LINK_LIBRARIES(rbackend ${R_USED_LIBS})
+ADD_LIBRARY(rbackend STATIC ${rbackend_STAT_SRCS})#
+TARGET_LINK_LIBRARIES(rbackend ${R_USED_LIBS} ${CMAKE_THREAD_LIBS_INIT})
 LINK_DIRECTORIES(${R_SHAREDLIBDIR})


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