Merge V8_4_BR branch.

diff --git a/cmake/FindPTScotch.cmake b/cmake/FindPTScotch.cmake
new file mode 100644 (file)
index 0000000..5dadcce
--- /dev/null
+++ b/cmake/FindPTScotch.cmake
@@ -0,0 +1,35 @@
+# Copyright (C) 2017  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# 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.
+#
+# 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
+#
+
+# ------
+
+MESSAGE(STATUS "Check for PTscotch ...")
+
+SET(PTSCOTCH_ROOT_DIR $ENV{PTSCOTCH_ROOT_DIR} CACHE PATH "Path to the PTSCOTCH.")
+IF(PTSCOTCH_ROOT_DIR)
+  LIST(APPEND CMAKE_PREFIX_PATH "${PTSCOTCH_ROOT_DIR}")
+ENDIF(PTSCOTCH_ROOT_DIR)
+
+FIND_LIBRARY(PTSCOTCH_LIBRARIES ptscotch)
+FIND_LIBRARY(PTSCOTCH_ERR_LIBRARIES ptscotcherr)
+SET(PTSCOTCH_LIBRARIES ${PTSCOTCH_LIBRARIES} ${PTSCOTCH_ERR_LIBRARIES})
+FIND_PATH(PTSCOTCH_INCLUDE_DIRS scotch.h PATH_SUFFIXES "/scotch")
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PTScotch REQUIRED_VARS PTSCOTCH_INCLUDE_DIRS PTSCOTCH_LIBRARIES)

diff --git a/cmake/FindSalomePTScotch.cmake b/cmake/FindSalomePTScotch.cmake
new file mode 100644 (file)
index 0000000..3fdea67
--- /dev/null
+++ b/cmake/FindSalomePTScotch.cmake
@@ -0,0 +1,33 @@
+# Copyright (C) 2017  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# 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.
+#
+# 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
+#
+# Author: Adrien Bruneton
+#
+
+# Medfile detection dor Salome
+#
+#  !! Please read the generic detection procedure in SalomeMacros.cmake !!
+#
+
+SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(PTScotch SCOTCH_INCLUDE_DIRS 1)
+#MARK_AS_ADVANCED()
+
+IF(SCOTCH_FOUND)
+  SALOME_ACCUMULATE_HEADERS(PTSCOTCH_INCLUDE_DIRS)
+  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${PTSCOTCH_LIBRARIES})
+ENDIF()