X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeModules%2FFindPThread.cmake;h=ecf2404127eb1d29731558e986885bafb1538777;hb=b4e59846fd2eaf893548f182645e7162da4ad731;hp=690fdfcdfc35c2b01d5ec4ee609fb9e90e52b12c;hpb=e57570465fd02fd7ea993770d9696ecb16042020;p=tools%2Flibbatch.git

diff --git a/CMakeModules/FindPThread.cmake b/CMakeModules/FindPThread.cmake
index 690fdfc..ecf2404 100644
--- a/CMakeModules/FindPThread.cmake
+++ b/CMakeModules/FindPThread.cmake
@@ -1,69 +1,62 @@
-#  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+# - Find PThread
+# This module finds an installed PThread using the variable PTHREAD_ROOT_DIR 
+# as a lookup path.
+# It sets the following variables:
+#  PTHREAD_FOUND       - set to true if PThread is found
+#  PTHREAD_INCLUDE_DIR - the directory where the include files are located
+#  PTHREAD_LIBRARY     - the path to PThread library
 #
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+# The file "pthread.h" is looked for PTHREAD_INCLUDE_DIR.
+# Libraries are searched with following names: 
+#    pthread
+# On Win32:
+#    pthreadVSE2 pthreadVC2
+# or in Debug mode:
+#    pthreadVSE2d pthreadVC2d
 #
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
+
+
+#############################################################
+# Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 #
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
 IF (NOT PThread_FIND_QUIETLY)
     MESSAGE(STATUS "Looking for PThread...")
-ENDIF (NOT PThread_FIND_QUIETLY)
+ENDIF ()
 
 IF(WIN32)
-    SET(PTHREADS_ROOT_USER $ENV{PTHREADS_ROOT})
-    SET(PTHREADS_FIND_PATHS_OPTION NO_DEFAULT_PATH)
     SET(PTHREADS_INCLUDE_TO_FIND pthread.h)
-    SET(PTHREADS_INCLUDE_PATHS ${PTHREADS_ROOT_USER}/include)
-    FIND_PATH(PTHREAD_INCLUDE_DIR ${PTHREADS_INCLUDE_TO_FIND}
-              PATHS ${PTHREADS_INCLUDE_PATHS} ${PTHREADS_FIND_PATHS_OPTION})
-    SET(PTHREADS_LIB_PATHS ${PTHREADS_ROOT_USER}/lib)
-    IF(CMAKE_BUILD_TYPE STREQUAL Release)
-        FIND_LIBRARY(PTHREAD_LIBRARY pthreadVSE2 pthreadVC2
-                     PATHS ${PTHREADS_LIB_PATHS} ${PTHREADS_FIND_PATHS_OPTION})
-    ELSE(CMAKE_BUILD_TYPE STREQUAL Release)
-        FIND_LIBRARY(PTHREAD_LIBRARY pthreadVSE2d pthreadVC2d
-                     PATHS ${PTHREADS_LIB_PATHS} ${PTHREADS_FIND_PATHS_OPTION})
-    ENDIF(CMAKE_BUILD_TYPE STREQUAL Release)
+    FIND_PATH(PTHREAD_INCLUDE_DIR ${PTHREADS_INCLUDE_TO_FIND})
+    FIND_LIBRARY(PTHREAD_LIBRARY pthreadVC2 pthreadVC2d)
 ELSE(WIN32)
     FIND_PATH(PTHREAD_INCLUDE_DIR pthread.h)
     FIND_LIBRARY(PTHREAD_LIBRARY NAMES pthread)
 ENDIF(WIN32)
 
-IF (PTHREAD_INCLUDE_DIR AND PTHREAD_LIBRARY)
-    SET(PThread_FOUND True)
-ENDIF (PTHREAD_INCLUDE_DIR AND PTHREAD_LIBRARY)
-
-IF (PThread_FOUND)
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PThread REQUIRED_VARS PTHREAD_INCLUDE_DIR PTHREAD_LIBRARY)
 
+IF (PTHREAD_FOUND)
     IF (NOT PThread_FIND_QUIETLY)
-        MESSAGE(STATUS "Found PThread:")
-        MESSAGE(STATUS "PThread include directory: ${PTHREAD_INCLUDE_DIR}")
         MESSAGE(STATUS "PThread library: ${PTHREAD_LIBRARY}")
     ENDIF (NOT PThread_FIND_QUIETLY)
-
-ELSE (PThread_FOUND)
-
-    IF (PThread_FIND_REQUIRED)
-        MESSAGE(FATAL_ERROR "PThread not found")
-    ELSE (PThread_FIND_REQUIRED)
-        IF (NOT PThread_FIND_QUIETLY)
-            MESSAGE(STATUS "PThread not found")
-        ENDIF (NOT PThread_FIND_QUIETLY)
-    ENDIF (PThread_FIND_REQUIRED)
-
-ENDIF (PThread_FOUND)
+ENDIF()