Fix openturns dependencies - Disable SOLVERLAB use until FindTBB fixing - Remove...

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index 133bdc61bf7c3f9a808432b158fb400d1aa4c58c..6005a8a0f38301aac2b97e9537113f22df4d3be0 100644 (file)
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -137,7 +137,7 @@ APPLICATION :
         'JOBMANAGER' : {section : "default_MPI", verbose: 'yes'}
         'YACS'
         'YACSGEN'
-        'SOLVERLAB' : {section : "default_MPI", hpc: 'yes'}
+#        'SOLVERLAB' : {section : "default_MPI", hpc: 'yes'}
         'DOCUMENTATION'
         'SAMPLES'
         'COMPONENT'

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index aeb00219d23929a02fbeee39afbce19362616205..c25b22e81417b888088d14f213c2ba9d6afd0d4d 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -53,7 +53,6 @@ APPLICATION :
         gmsh : '4.1.4'
         graphviz : 'native'
         hdf5 : '1.10.3'
-        homard_bin : '11.12_hdf51103med410'
         idna : 'native'
         imagesize : 'native'
         # 'native' not exists (only available on Fedora platform)
@@ -141,7 +140,7 @@ APPLICATION :
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
-        'SOLVERLAB'
+#        'SOLVERLAB'
         'DOCUMENTATION'
         'SAMPLES'
         'COMPONENT'

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 17b94d48ef3e4b224df6123fc0c7cf18e9d56cff..c3c598183211250dcb954a13e39f635ff5dc3362 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -135,7 +135,7 @@ APPLICATION :
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
-        'SOLVERLAB'
+#        'SOLVERLAB'
         'DOCUMENTATION'
         'SAMPLES'
         'COMPONENT'

diff --git a/products/glfw.pyconf b/products/glfw.pyconf
deleted file mode 100644 (file)
index cd6e578..0000000
--- a/products/glfw.pyconf
+++ /dev/null
@@ -1,17 +0,0 @@
-default :
-{
-    name : "glfw"
-    get_source : "native"
-    system_info : 
-    {
-        rpm : []
-        rpm_dev : ["glfw-devel"]
-        apt : []
-        apt_dev : ["glfw-dev"]
-    }
-    depend : []
-    properties :
-    {
-      incremental : "yes"
-    }
-}

diff --git a/products/openturns.pyconf b/products/openturns.pyconf
index d12cf87154674cbd26f434a15f20934c413e083a..fa3efc3adfc2c90853e5c25564d4e9c4cb980620 100644 (file)
--- a/products/openturns.pyconf
+++ b/products/openturns.pyconf
@@ -8,7 +8,7 @@ default :
     {
        env_script : $name + ".py"
     }
-    depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen','pthreads']
+    depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen']
     build_depend : ["cmake", "swig"]
     patches : []
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
@@ -21,7 +21,12 @@ default :
     }
 }
 
+default_win :
+{
+    depend : ['Python', 'lapack', 'hdf5', 'tbb', 'nlopt', 'libxml2', 'eigen', 'pthreads']
+}
+
 version_1_16 :
 {
-  patches : ['openturns-1.16.0001.patch']
+    patches : ['openturns-1.16.0001.patch']
 }