[Clucene-cvs] SF.net SVN: clucene:[2922] branches/lucene2_3_2/src/shared

[<ust...@us...>]

Revision: 2922
          http://clucene.svn.sourceforge.net/clucene/?rev=2922&view=rev
Author:   ustramooner
Date:     2008-10-02 21:20:17 +0000 (Thu, 02 Oct 2008)

Log Message:
-----------
fixed pthread recursive check and pthread lib linkage

Modified Paths:
--------------
    branches/lucene2_3_2/src/shared/CMakeLists.txt
    branches/lucene2_3_2/src/shared/cmake/CheckPthread.cmake

Modified: branches/lucene2_3_2/src/shared/CMakeLists.txt
===================================================================
--- branches/lucene2_3_2/src/shared/CMakeLists.txt	2008-10-02 18:30:38 UTC (rev 2921)
+++ branches/lucene2_3_2/src/shared/CMakeLists.txt	2008-10-02 21:20:17 UTC (rev 2922)
@@ -32,9 +32,11 @@
 INCLUDE (CheckHashmaps)
 INCLUDE (CheckNamespace)
 INCLUDE (CheckSnprintf)
-INCLUDE (CheckPthread)
 INCLUDE (CheckStdCallFunctionExists)
 
+find_package(Threads REQUIRED)
+INCLUDE (CheckPthread)
+
 ########################################################################
 # test for headers
 ########################################################################
@@ -198,10 +200,8 @@
 ########################################################################
 
 #check for pthreads
-find_package(Threads REQUIRED)
 IF ( CMAKE_USE_WIN32_THREADS_INIT )
     SET ( _CL_HAVE_WIN32_THREADS 1 )
-    SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_THREAD_LIBS_INIT}" )
 ENDIF ( CMAKE_USE_WIN32_THREADS_INIT )
 IF ( CMAKE_USE_PTHREADS_INIT )
     SET ( _CL_HAVE_PTHREAD 1 )
@@ -209,6 +209,7 @@
 IF ( CMAKE_USE_SPROC_INIT OR CMAKE_HP_PTHREADS_INIT )
     MESSAGE(FATAL_ERROR "Threads library not implemented")
 ENDIF( CMAKE_USE_SPROC_INIT OR CMAKE_HP_PTHREADS_INIT )
+SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_THREAD_LIBS_INIT}" )
 
 #define if we have pthreads with recusrive capabilities
 CHECK_PTHREAD_RECURSIVE(_CL_HAVE_PTHREAD _CL_HAVE_PTHREAD_MUTEX_RECURSIVE)

Modified: branches/lucene2_3_2/src/shared/cmake/CheckPthread.cmake
===================================================================
--- branches/lucene2_3_2/src/shared/cmake/CheckPthread.cmake	2008-10-02 18:30:38 UTC (rev 2921)
+++ branches/lucene2_3_2/src/shared/cmake/CheckPthread.cmake	2008-10-02 21:20:17 UTC (rev 2922)
@@ -1,7 +1,10 @@
 #define if we have pthreads with recusrive capabilities
 
 MACRO ( CHECK_PTHREAD_RECURSIVE ifpthread result) 
+
 IF ( ${ifpthread} )
+	SET ( CMAKE_REQUIRED_FLAGS "${CMAKE_THREAD_LIBS_INIT}")
+
     CHECK_CXX_SOURCE_RUNS("
         #include <sys/types.h>
         #include <pthread.h>
@@ -17,5 +20,8 @@
         }
     " ${result} )
     #NOTE: pthread_mutexattr_setkind_np is the deprecated name for pthread_mutexattr_settype. old compilers might need it
+
+	
+	SET ( CMAKE_REQUIRED_FLAGS)
 ENDIF ( ${ifpthread} )
 ENDMACRO ( CHECK_PTHREAD_RECURSIVE ) 


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