Add possibility to build the module without VISU if it is abcent.

diff --git a/build_configure b/build_configure
index eff071dcd79c5f9644a252c5b9e4ee7beb69a1b5..36c2605143a44048b88fd1d714e53c42ac8cb6a0 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -59,14 +59,6 @@ if test ! -d "${RANDOMIZER_ROOT_DIR}"; then
     exit
 fi
 
-########################################################################
-# Test if the VISU_ROOT_DIR is set correctly
-
-if test ! -d "${VISU_ROOT_DIR}"; then
-    echo "failed : VISU_ROOT_DIR variable is not correct !"
-    exit
-fi
-
 cd ${CONF_DIR}
 ABS_CONF_DIR=`pwd`
 
@@ -81,12 +73,21 @@ ABS_CONF_DIR=`pwd`
 #   autom4te.cache (directory)
 echo "======================================================= aclocal"
 
-aclocal -I adm_local/unix/config_files \
-        -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
-       -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
-       -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
-       -I ${VISU_ROOT_DIR}/adm_local/unix/config_files \
-       -I ${RANDOMIZER_ROOT_DIR}/adm_local/unix/config_files || exit 1
+if test -d "${VISU_ROOT_DIR}"; then
+    aclocal -I adm_local/unix/config_files \
+           -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
+           -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
+           -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
+           -I ${VISU_ROOT_DIR}/adm_local/unix/config_files \
+           -I ${RANDOMIZER_ROOT_DIR}/adm_local/unix/config_files || exit 1
+else
+    echo "warning : VISU_ROOT_DIR variable is not correct! SIERPINSKY will be configured without VISU module."
+    aclocal -I adm_local/unix/config_files \
+           -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
+           -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
+           -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
+           -I ${RANDOMIZER_ROOT_DIR}/adm_local/unix/config_files || exit 1
+fi
 
 # ____________________________________________________________________
 # libtoolize creates some configuration files (ltmain.sh,

diff --git a/configure.ac b/configure.ac
index 4ef02db8040e2516dd4d39c70adda44dc9c9d4d6..88be1a7607a71ac8c6527e7beff6698781c83c12 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -333,6 +333,8 @@ echo
 
 CHECK_VISU
 
+AM_CONDITIONAL(WITH_VISU, [test "${Visu_ok}" = "yes"])
+
 echo
 echo ---------------------------------------------
 echo Testing Randomizer

diff --git a/src/SierpinskyGUI/Makefile.am b/src/SierpinskyGUI/Makefile.am
index 41f10ab6fe95ccd1f358430f6c62abdcaecd517f..ee56ebb637b5f142dbb04d1d7aac769cb39e1e7b 100644 (file)
--- a/src/SierpinskyGUI/Makefile.am
+++ b/src/SierpinskyGUI/Makefile.am
@@ -56,7 +56,6 @@ libSIERPINSKY_la_CPPFLAGS = \
        $(VTK_INCLUDES) \
        $(KERNEL_CXXFLAGS) \
        $(MED_CXXFLAGS) \
-       $(VISU_CXXFLAGS) \
        $(RANDOMIZER_CXXFLAGS) \
        $(GUI_CXXFLAGS) \
        $(BOOST_CPPFLAGS) \
@@ -66,16 +65,22 @@ libSIERPINSKY_la_CPPFLAGS = \
        -I$(top_builddir) \
        -I$(top_builddir)/idl
 
+if WITH_VISU
+    libSIERPINSKY_la_CPPFLAGS += $(VISU_CXXFLAGS) -DWITH_VISU
+endif
+
 libSIERPINSKY_la_LDFLAGS  = \
        ../Sierpinsky/libSIERPINSKYEngine.la \
        $(KERNEL_LDFLAGS) \
        -lSalomeLifeCycleCORBA \
        $(GUI_LDFLAGS) \
        -lSalomeApp \
-       $(VISU_LDFLAGS) \
-       -lSalomeIDLVISU \
        $(RANDOMIZER_LDFLAGS) \
        -lSalomeIDLRANDOMIZER \
        $(QT_LIBS) 
 
+if WITH_VISU
+    libSIERPINSKY_la_LDFLAGS += $(VISU_LDFLAGS) -lSalomeIDLVISU
+endif
+
 

diff --git a/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx b/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx
index 75088e224d276c6bf762a8eb59abc1825d905ba1..8bdb37805f6442e63a2c79c4956d561406a0c084 100644 (file)
--- a/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx
+++ b/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx
@@ -49,7 +49,9 @@
 #include CORBA_SERVER_HEADER(Sierpinsky)
 #include CORBA_CLIENT_HEADER(Randomizer)
 #include CORBA_CLIENT_HEADER(SALOMEDS)
+#ifdef WITH_VISU
 #include CORBA_CLIENT_HEADER(VISU_Gen)
+#endif
 
 /*!
  * Get Randomizer component engine
@@ -95,6 +97,7 @@ static SIERPINSKY_ORB::SIERPINSKY_var getSierpinskyEngine()
   return aGen;
 }
 
+#ifdef WITH_VISU
 /*!
  * Get VISU component engine
  */
@@ -117,6 +120,7 @@ static VISU::VISU_Gen_var getVisuEngine()
   }
   return aGen;
 }
+#endif
 
 #define MY_EVENT QEvent::User + 555
 class MyEvent : public QEvent
@@ -362,6 +366,9 @@ SierpinskyGUI_RunDlg::SierpinskyGUI_RunDlg( QWidget* parent, SierpinskyGUI* modu
   myMedCheck->setChecked( false );
   myMedSize->setValue( 100 );
   myVisuCheck->setChecked( true );
+#ifndef WITH_VISU
+  myVisuCheck->setVisible( false );
+#endif
   updateState();
 }
 
@@ -568,6 +575,7 @@ void SierpinskyGUI_RunDlg::nextStep( const int step )
       double aMEDSize = myMedSize->value();
       if ( !aMEDFile.isEmpty() && aMEDSize > 0 ) {
         bool res = getSierpinskyEngine()->ExportToMED( aMEDFile.toLatin1().data(), aMEDSize );
+#ifdef WITH_VISU
        if ( res && myVisuCheck->isChecked() ) {
           VISU::VISU_Gen_var aVisuGen = getVisuEngine();
           if ( !CORBA::is_nil( aVisuGen ) ) {
@@ -577,6 +585,7 @@ void SierpinskyGUI_RunDlg::nextStep( const int step )
            myModule->getApp()->updateObjectBrowser( true );
           }
         }
+#endif
       }
     }
   }