From: bruneton <bruneton>
Date: Tue, 18 Jun 2013 08:43:10 +0000 (+0000)
Subject: Minor tweaks for windows configuration: removed "pthreadVSE".
X-Git-Tag: V2_1_0rc1~10
X-Git-Url: http://git.salome-platform.org/gitweb/?p=tools%2Flibbatch.git;a=commitdiff_plain;h=bee2cbd48175ca7c8b3dc0291c27693936472f80

Minor tweaks for windows configuration: removed "pthreadVSE".
---

diff --git a/CMakeModules/FindLibbatchPython.cmake b/CMakeModules/FindLibbatchPython.cmake
index d460841..e62d008 100644
--- a/CMakeModules/FindLibbatchPython.cmake
+++ b/CMakeModules/FindLibbatchPython.cmake
@@ -101,7 +101,9 @@ IF (LIBBATCHPYTHON_FOUND)
   # For Python this is the grand-parent of the
   # include directory:
   GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${PYTHON_INCLUDE_DIR}" PATH)
-  GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${_tmp_ROOT_DIR}" PATH)
+  IF(NOT WIN32)
+    GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${_tmp_ROOT_DIR}" PATH)
+  ENDIF()
 
   # 4. Warn if CMake found something not located under ENV(XYZ_ROOT_DIR)
   IF(DEFINED ENV{PYTHON_ROOT_DIR})
diff --git a/CMakeModules/FindPThread.cmake b/CMakeModules/FindPThread.cmake
index 4742400..81de02e 100644
--- a/CMakeModules/FindPThread.cmake
+++ b/CMakeModules/FindPThread.cmake
@@ -45,19 +45,13 @@ IF (NOT PThread_FIND_QUIETLY)
 ENDIF ()
 
 IF(WIN32)
-    SET(PTHREADS_FIND_PATHS_OPTION NO_DEFAULT_PATH)
     SET(PTHREADS_INCLUDE_TO_FIND pthread.h)
-    SET(PTHREADS_INCLUDE_PATHS ${PTHREAD_ROOT_DIR}/include)
-    FIND_PATH(PTHREAD_INCLUDE_DIR ${PTHREADS_INCLUDE_TO_FIND}
-              PATHS ${PTHREADS_INCLUDE_PATHS} ${PTHREADS_FIND_PATHS_OPTION})
-    SET(PTHREADS_LIB_PATHS ${PTHREAD_ROOT_DIR}/lib)
+    FIND_PATH(PTHREAD_INCLUDE_DIR ${PTHREADS_INCLUDE_TO_FIND})
     # Default build type is assumed to be Release:
     IF(NOT CMAKE_BUILD_TYPE STREQUAL Debug)
-        FIND_LIBRARY(PTHREAD_LIBRARY pthreadVSE2 pthreadVC2
-                     PATHS ${PTHREADS_LIB_PATHS} ${PTHREADS_FIND_PATHS_OPTION})
+        FIND_LIBRARY(PTHREAD_LIBRARY pthreadVC2)
     ELSE()
-        FIND_LIBRARY(PTHREAD_LIBRARY pthreadVSE2d pthreadVC2d
-                     PATHS ${PTHREADS_LIB_PATHS} ${PTHREADS_FIND_PATHS_OPTION})
+        FIND_LIBRARY(PTHREAD_LIBRARY pthreadVC2d)
     ENDIF()
 ELSE(WIN32)
     FIND_PATH(PTHREAD_INCLUDE_DIR pthread.h)