bos #42837: ensure compilation if Lapack is embedded

diff --git a/products/patches/BOS-42837-MEDCOUPLING-ShapeRecognition.p02.patch b/products/patches/BOS-42837-MEDCOUPLING-ShapeRecognition.p02.patch
index d8f2a7dff1597584f9dc0b56f2be1647cad27fe3..f9634469d07b14674d52247143438b6e54a328b3 100644 (file)
--- a/products/patches/BOS-42837-MEDCOUPLING-ShapeRecognition.p02.patch
+++ b/products/patches/BOS-42837-MEDCOUPLING-ShapeRecognition.p02.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cf1a05b..4898c8e 100644
+index cf1a05b5..b53188fe 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -203,7 +203,17 @@ IF(MEDCOUPLING_ENABLE_RENUMBER)
+@@ -203,7 +203,18 @@ IF(MEDCOUPLING_ENABLE_RENUMBER)
  ENDIF(MEDCOUPLING_ENABLE_RENUMBER)
  
  IF(MEDCOUPLING_ENABLE_SHAPERECOGN)
@@ -10,19 +10,20 @@ index cf1a05b..4898c8e 100644
 +  SET(CBLAS_ROOT_DIR $ENV{CBLAS_ROOT_DIR} CACHE PATH "Path to the LAPACK/CBLAS.")
 +  IF(CBLAS_ROOT_DIR)
 +    LIST(APPEND CMAKE_PREFIX_PATH "${CBLAS_ROOT_DIR}")
++    FIND_PACKAGE(CBLAS REQUIRED)
++  ELSE(CBLAS_ROOT_DIR)
++    FIND_PACKAGE(BLAS REQUIRED)
 +  ENDIF(CBLAS_ROOT_DIR)
-+  FIND_PACKAGE(CBLAS REQUIRED)
 +  SET(LAPACK_ROOT_DIR $ENV{LAPACK_ROOT_DIR} CACHE PATH "Path to the LAPACKE")
 +  IF(LAPACK_ROOT_DIR)
 +    SET(LAPACK_ROOT_DIR $ENV{LAPACK_ROOT_DIR} CACHE PATH "Path to the LAPACK.")
 +    LIST(APPEND CMAKE_PREFIX_PATH "${LAPACK_ROOT_DIR}")
 +  ENDIF(LAPACK_ROOT_DIR)
-+
    FIND_PACKAGE(LAPACK REQUIRED)
    FIND_LIBRARY(LAPACKE_LIB NAMES lapacke REQUIRED)
    SET(LAPACK_LIBRARIES ${LAPACKE_LIB} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
 diff --git a/src/ShapeRecogn/Test/CMakeLists.txt b/src/ShapeRecogn/Test/CMakeLists.txt
-index a7df417..f73ebd6 100644
+index a7df4179..f73ebd6a 100644
 --- a/src/ShapeRecogn/Test/CMakeLists.txt
 +++ b/src/ShapeRecogn/Test/CMakeLists.txt
 @@ -47,7 +47,7 @@ SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
@@ -35,7 +36,7 @@ index a7df417..f73ebd6 100644
    INSTALL(TARGETS ${TESTSHAPE_RECOGN0} DESTINATION ${MEDCOUPLING_INSTALL_BINS})
    
 diff --git a/src/ShapeRecogn/Test/ConeTest.cxx b/src/ShapeRecogn/Test/ConeTest.cxx
-index 2da2193..25ead55 100644
+index 2da2193b..25ead55d 100644
 --- a/src/ShapeRecogn/Test/ConeTest.cxx
 +++ b/src/ShapeRecogn/Test/ConeTest.cxx
 @@ -192,7 +192,7 @@ void ConeTest::testComputeConeProperties()
@@ -66,7 +67,7 @@ index 2da2193..25ead55 100644
      std::vector<mcIdType> nodeIdsRef{
          0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
 diff --git a/src/ShapeRecogn/Test/CylinderTest.cxx b/src/ShapeRecogn/Test/CylinderTest.cxx
-index 2e08bdf..6b7fc7f 100644
+index 2e08bdf1..6b7fc7fb 100644
 --- a/src/ShapeRecogn/Test/CylinderTest.cxx
 +++ b/src/ShapeRecogn/Test/CylinderTest.cxx
 @@ -50,7 +50,7 @@ void CylinderTest::testNumberOfAreas()
@@ -97,7 +98,7 @@ index 2e08bdf..6b7fc7f 100644
      std::vector<mcIdType> nodeIdsRef{
          443, 444, 445, 446, 447, 448, 449, 450, 451, 452,
 diff --git a/src/ShapeRecogn/Test/MathOpsTest.cxx b/src/ShapeRecogn/Test/MathOpsTest.cxx
-index 6841fe0..82a27b9 100644
+index 6841fe09..82a27b96 100644
 --- a/src/ShapeRecogn/Test/MathOpsTest.cxx
 +++ b/src/ShapeRecogn/Test/MathOpsTest.cxx
 @@ -19,7 +19,7 @@
@@ -110,7 +111,7 @@ index 6841fe0..82a27b9 100644
  
  void MathOpsTest::testLstsq()
 diff --git a/src/ShapeRecogn/Test/MathOpsTest.hxx b/src/ShapeRecogn/Test/MathOpsTest.hxx
-index 8cbc635..8b5b3fd 100644
+index 8cbc635f..8b5b3fd2 100644
 --- a/src/ShapeRecogn/Test/MathOpsTest.hxx
 +++ b/src/ShapeRecogn/Test/MathOpsTest.hxx
 @@ -37,12 +37,12 @@ namespace MEDCoupling
@@ -134,7 +135,7 @@ index 8cbc635..8b5b3fd 100644
      };
  }
 diff --git a/src/ShapeRecogn/Test/SphereTest.cxx b/src/ShapeRecogn/Test/SphereTest.cxx
-index b219e1a..630f55c 100644
+index b219e1ad..630f55c8 100644
 --- a/src/ShapeRecogn/Test/SphereTest.cxx
 +++ b/src/ShapeRecogn/Test/SphereTest.cxx
 @@ -47,7 +47,7 @@ void SphereTest::testArea()
@@ -147,7 +148,7 @@ index b219e1a..630f55c 100644
      std::array<double, 3> centerRef = {5.3, -6.7, -9.02};
      std::array<double, 3> center = areas->getCenter(0);
 diff --git a/src/ShapeRecogn/Test/TestShapeRecogn.cxx b/src/ShapeRecogn/Test/TestShapeRecogn.cxx
-index 8d07cce..fb2e25e 100644
+index 8d07cce9..fb2e25e3 100644
 --- a/src/ShapeRecogn/Test/TestShapeRecogn.cxx
 +++ b/src/ShapeRecogn/Test/TestShapeRecogn.cxx
 @@ -17,6 +17,7 @@
@@ -159,7 +160,7 @@ index 8d07cce..fb2e25e 100644
  #include "PlaneTest.hxx"
  #include "CylinderTest.hxx"
 diff --git a/src/ShapeRecogn/Test/TorusTest.cxx b/src/ShapeRecogn/Test/TorusTest.cxx
-index fecb7b3..32ab1c2 100644
+index fecb7b36..32ab1c26 100644
 --- a/src/ShapeRecogn/Test/TorusTest.cxx
 +++ b/src/ShapeRecogn/Test/TorusTest.cxx
 @@ -46,7 +46,7 @@ void TorusTest::testArea()