Minor tweaks for windows configuration: removed "pthreadVSE".

diff --git a/CMakeModules/FindLibbatchPython.cmake b/CMakeModules/FindLibbatchPython.cmake
index d460841863c7fc3749da2d603c67bedba559fb10..e62d008aa3f821eb2fe4faf09d75c7ad224006fe 100644 (file)
--- 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 47424007f975295dfe7f581f3524503d3931eabd..81de02e7b43732b98cbcbb13bde6ae152f6605fb 100644 (file)
--- 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)