From de0dd12597faeb3c0249305d0d1a8582bdd83023 Mon Sep 17 00:00:00 2001 From: inv Date: Thu, 5 Apr 2012 11:23:01 +0000 Subject: [PATCH] SALOME 6.5.0 preparation: ParaView 3.14: fix problem with compiler hang-up when compiling SurfaceLIC plug-in --- config_files/ParaView.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config_files/ParaView.sh b/config_files/ParaView.sh index afbbb80..d0e17a4 100755 --- a/config_files/ParaView.sh +++ b/config_files/ParaView.sh @@ -95,6 +95,11 @@ if [ "${need_patch_ftgl}" == "1" ] ; then cp patches/paraview-3.10.1-ftgl.patch ${PRODUCT_SRC_DIR} ( cd ${PRODUCT_SRC_DIR} ; patch -p1 < paraview-3.10.1-ftgl.patch ) fi +# 4. patch hang-up of the compiler on some platforms when building SurfaceLIC plug-in +need_patch_surfaceLic=1 +if [ "${need_patch_surfaceLic}" == "1" ] ; then + test -f patches/surface_lic.png && cp -f patches/surface_lic.png ${PRODUCT_SRC_DIR}/Plugins/SurfaceLIC/doc +fi # to generate environment scripts try_preinstalled @@ -215,8 +220,7 @@ CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON" CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_ForceTime:BOOL=ON" CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_H5PartReader:BOOL=ON" CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_PointSprite:BOOL=ON" -############# VSR: IN PARAVIEW 3.14.0 SWITCHING THIS PLUG-IN ON LEADS TO THE COMPILER HANG-UP ################### -CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=OFF" +CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPARAVIEW_BUILD_PLUGIN_SurfaceLIC:BOOL=ON" ### Mesa settings (if pre-installed) [OBSOLETE] with_mesa=0 -- 2.39.2