]> SALOME platform Git repositories - tools/sat_salome.git/commitdiff
Salome HOME
Fix EFICAS_TOOLS compilation issue on DB10 in case embedded PyQt/sip are in use spns/32239
authorNabil Ghodbane <nabil.ghodbane@cea.fr>
Fri, 7 Oct 2022 14:06:19 +0000 (16:06 +0200)
committerNabil Ghodbane <nabil.ghodbane@cea.fr>
Fri, 7 Oct 2022 14:06:19 +0000 (16:06 +0200)
products/EFICAS_TOOLS.pyconf
products/compil_scripts/sip-5.5.0.sh

index 4ce2231be7c68c5ff81a0d957d9aa16e24094df9..b0483f23678c91e566b1fe008d5aef2d4b96ebd3 100644 (file)
@@ -13,7 +13,7 @@ default :
     {
        env_script : $name + ".py"
     }
-    depend : ['PyQt', 'Sphinx']
+    depend : ['PyQt', 'Sphinx', 'sip']
     build_depend : ["cmake"]
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
index 60f829ce6da69f525cc29d90bf3c71cc1bec5a0a..6f46bd1293dd35641247ebdf42d510e41160e74d 100755 (executable)
@@ -58,5 +58,15 @@ cp *.h $PRODUCT_INSTALL/include
 cd $PRODUCT_INSTALL/bin
 ln -sf sip5 sip
 
+LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION"
+case $LINUX_DISTRIBUTION in
+    DB10)
+        cd $PRODUCT_INSTALL/lib/python3.7/site-packages
+        ln -sf PyQt5_sip-12.8.1-py3.7-linux-x86_64.egg/PyQt5
+        ;;
+    *)
+        ;;
+esac
+
 echo
 echo "########## END"