Revision: 8188
http://playerstage.svn.sourceforge.net/playerstage/?rev=8188&view=rev
Author: gbiggs
Date: 2009-08-10 08:49:51 +0000 (Mon, 10 Aug 2009)
Log Message:
-----------
Worked around finding of pthreads on Windows.
Modified Paths:
--------------
code/player/trunk/cmake/internal/SearchForStuff.cmake
code/player/trunk/win32_todo.txt
Modified: code/player/trunk/cmake/internal/SearchForStuff.cmake
===================================================================
--- code/player/trunk/cmake/internal/SearchForStuff.cmake 2009-08-09
22:13:06 UTC (rev 8187)
+++ code/player/trunk/cmake/internal/SearchForStuff.cmake 2009-08-10
08:49:51 UTC (rev 8188)
@@ -188,12 +188,21 @@
TRY_COMPILE (HAVE_STL ${CMAKE_CURRENT_BINARY_DIR} ${testSTLSource})
# POSIX threads check
-SET (PTHREAD_INCLUDE_DIR "" CACHE STRING "Include directory for a POSIX
threads implementation providing pthread.h.")
+IF (PLAYER_OS_WIN)
+ SET (PTHREAD_DIR "" CACHE PATH "Root dir of pthreads-win32 installation.")
+ IF (PTHREAD_DIR STREQUAL "")
+ MESSAGE (FATAL_ERROR "Set PTHREAD_DIR to the directory in which you
have installed pthreads-win32, then re-run CMake.")
+ ENDIF (PTHREAD_DIR STREQUAL "")
+ SET (PTHREAD_INCLUDE_DIR "${PTHREAD_DIR}/include" CACHE PATH "Include
directory for a POSIX threads implementation providing pthread.h.")
+ SET (PTHREAD_LIB_DIR "${PTHREAD_DIR}/lib" CACHE PATH "Library directory
for a POSIX threads implementation providing pthread.lib (if using pthreads for
Win32, rename the .lib and .dll you have chosen).")
+ELSE (PLAYER_OS_WIN)
+ SET (PTHREAD_INCLUDE_DIR "" CACHE PATH "Include directory for a POSIX
threads implementation providing pthread.h.")
+ SET (PTHREAD_LIB_DIR "" CACHE PATH "Library directory for a POSIX threads
implementation providing pthread.lib (if using pthreads for Win32, rename the
.lib and .dll you have chosen).")
+ENDIF (PLAYER_OS_WIN)
MARK_AS_ADVANCED (PTHREAD_INCLUDE_DIR)
IF (NOT PTHREAD_INCLUDE_DIR STREQUAL "")
FILE (TO_CMAKE_PATH ${PTHREAD_INCLUDE_DIR} PTHREAD_INCLUDE_DIR)
ENDIF (NOT PTHREAD_INCLUDE_DIR STREQUAL "")
-SET (PTHREAD_LIB_DIR "" CACHE STRING "Library directory for a POSIX threads
implementation providing pthread.lib (if using pthreads for Win32, rename the
.lib and .dll you have chosen).")
MARK_AS_ADVANCED (PTHREAD_LIB_DIR)
IF (NOT PTHREAD_LIB_DIR STREQUAL "")
FILE (TO_CMAKE_PATH ${PTHREAD_LIB_DIR} PTHREAD_LIB_DIR)
Modified: code/player/trunk/win32_todo.txt
===================================================================
--- code/player/trunk/win32_todo.txt 2009-08-09 22:13:06 UTC (rev 8187)
+++ code/player/trunk/win32_todo.txt 2009-08-10 08:49:51 UTC (rev 8188)
@@ -1,5 +1,4 @@
This list is incomplete.
-- Fix usage of user-configured pthreads location
- Python bindings
- Finding GTK
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
