-dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the terms of the GNU Lesser General Public
-dnl License as published by the Free Software Foundation; either
-dnl version 2.1 of the License.
-dnl
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-dnl Lesser General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU Lesser General Public
-dnl License along with this library; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-dnl
-dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
dnl
+dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+dnl
+dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
dnl
AC_DEFUN([CHECK_CAS],[
AC_REQUIRE([AC_PROG_CXX])dnl
AC_SUBST(CAS_LDPATH)
AC_SUBST(CAS_STDPLUGIN)
-OWN_CONFIG_H=no
-
CAS_CPPFLAGS=""
CAS_CXXFLAGS=""
CAS_LDFLAGS=""
occ_ok=no
-own_config_h=no
+config_h=no
dnl libraries directory location
case $host_os in
AC_MSG_CHECKING(for OpenCascade directories)
-if test -z $CASROOT; then
+if test -z "$CASROOT"; then
AC_MSG_RESULT(CASROOT not defined)
for d in `echo $LD_LIBRARY_PATH | sed -e "s/:/ /g"` ; do
if test -f $d/libTKernel.so ; then
dnl were is OCC ?
-if test -z $CASROOT; then
+if test -z "$CASROOT"; then
AC_MSG_WARN(You must provide CASROOT variable : see OCC installation manual)
else
occ_ok=yes
OCC_VERSION_MAJOR=0
OCC_VERSION_MINOR=0
+ OCC_VERSION_MAINTENANCE=0
ff=$CASROOT/inc/Standard_Version.hxx
if test -f $ff ; then
grep "define OCC_VERSION_MAJOR" $ff > /dev/null
if test $? = 0 ; then
OCC_VERSION_MINOR=`grep "define OCC_VERSION_MINOR" $ff | awk '{i=3 ; print $i}'`
fi
+ grep "define OCC_VERSION_MAINTENANCE" $ff > /dev/null
+ if test $? = 0 ; then
+ OCC_VERSION_MAINTENANCE=`grep "define OCC_VERSION_MAINTENANCE" $ff | awk '{i=3 ; print $i}'`
+ fi
fi
fi
CPPFLAGS_old="$CPPFLAGS"
case $host_os in
linux*)
- CAS_CPPFLAGS="-DOCC_VERSION_MAJOR=$OCC_VERSION_MAJOR -DLIN -DLINTEL -DCSFDB -DNO_CXX_EXCEPTION -DNo_exception -DHAVE_CONFIG_H -DHAVE_LIMITS_H -DHAVE_WOK_CONFIG_H -I$CASROOT/inc"
+ CAS_CPPFLAGS="-DOCC_VERSION_MAJOR=$OCC_VERSION_MAJOR -DOCC_VERSION_MINOR=$OCC_VERSION_MINOR -DOCC_VERSION_MAINTENANCE=$OCC_VERSION_MAINTENANCE -DLIN -DLINTEL -DCSFDB -DNo_exception -DHAVE_CONFIG_H -DHAVE_LIMITS_H -DHAVE_WOK_CONFIG_H"
+
+ OCC_VERSION_STRING="$OCC_VERSION_MAJOR.$OCC_VERSION_MINOR.$OCC_VERSION_MAINTENANCE"
+ case $OCC_VERSION_STRING in
+ [[0-5]].* | 6.0.* | 6.1.0) # catch versions < 6.1.1
+ CAS_CPPFLAGS="$CAS_CPPFLAGS -DNO_CXX_EXCEPTION"
+ ;;
+ *)
+ CAS_CPPFLAGS="$CAS_CPPFLAGS -DOCC_CONVERT_SIGNALS"
+ ;;
+ esac
+ CAS_CPPFLAGS="$CAS_CPPFLAGS -I$CASROOT/inc"
;;
osf*)
- CAS_CPPFLAGS="-DOCC_VERSION_MAJOR=$OCC_VERSION_MAJOR -DLIN -DLINTEL -DCSFDB -DNo_exception -DHAVE_CONFIG_H -DHAVE_LIMITS_H -DHAVE_WOK_CONFIG_H -I$CASROOT/inc"
+ CAS_CPPFLAGS="-DOCC_VERSION_MAJOR=$OCC_VERSION_MAJOR -DOCC_VERSION_MINOR=$OCC_VERSION_MINOR -DOCC_VERSION_MAINTENANCE=$OCC_VERSION_MAINTENANCE -DLIN -DLINTEL -DCSFDB -DNo_exception -DHAVE_CONFIG_H -DHAVE_LIMITS_H -DHAVE_WOK_CONFIG_H -I$CASROOT/inc"
;;
esac
CPPFLAGS="$CPPFLAGS $CAS_CPPFLAGS"
- if test -n $KERNEL_ROOT_DIR; then
- if test -d $KERNEL_ROOT_DIR/include/salome; then
- CAS_CPPFLAGS="$CAS_CPPFLAGS -I$KERNEL_ROOT_DIR/include/salome"
- CPPFLAGS="$CPPFLAGS -I$KERNEL_ROOT_DIR/include/salome"
- fi
- fi
- CAS_CPPFLAGS="$CAS_CPPFLAGS -I${ROOT_BUILDDIR}/include/salome"
- CPPFLAGS="$CPPFLAGS -I${ROOT_BUILDDIR}/salome_adm/unix"
-
- echo
echo
echo testing config.h
- echo
- echo
- AC_CHECK_HEADER(config.h, own_config_h=no, [
- echo
- echo
- echo "config.h file not found! Generating it..."
- echo
- echo
- mv confdefs.h backup_confdefs.h
- ${ROOT_SRCDIR}/make_config
- rm -rf ${ROOT_BUILDDIR}/*.log
- rm -rf ${ROOT_BUILDDIR}/*.status
- mv backup_confdefs.h confdefs.h
- rm -f backup_confdefs.h
- own_config_h=yes
- echo
- echo
+ AC_CHECK_HEADER(config.h, config_h=yes, [
+ echo "config.h file not found!"
])
- if test "x$own_config_h" = xyes ; then
- OWN_CONFIG_H=yes
+ if test "x$config_h" = xno ; then
+ AC_MSG_WARN(config.h file not found)
+ dnl There is no consequence for SALOME building because
+ dnl this file is not used. SALOME uses SALOMEconfig.h instead!
+ else
+ AC_MSG_RESULT(config.h file ok)
fi
AC_CHECK_HEADER(Standard_Type.hxx,occ_ok=yes ,occ_ok=no)
fi
-AC_SUBST(OWN_CONFIG_H)
-
if test "x$occ_ok" = xyes ; then
AC_MSG_CHECKING(for OpenCascade libraries)
AC_CACHE_VAL(salome_cv_lib_occ,[
AC_TRY_LINK(
-#include <Standard_Type.hxx>
-, size_t size;
- const Standard_CString aName="toto";
- Standard_Type myST(aName) ;
- myST.Find(aName);,
+#include <TCollection_AsciiString.hxx>
+, TCollection_AsciiString aStr ("toto");
+ aStr.Capitalize();,
eval "salome_cv_lib_occ=yes",eval "salome_cv_lib_occ=no")
])
occ_ok="$salome_cv_lib_occ"
CAS_KERNEL="$CAS_LDPATH -lTKernel"
CAS_MATH="$CAS_LDPATH -lTKMath"
- CAS_OCAF="$CAS_LDPATH -lTKernel -lTKCDF -lTKLCAF"
- CAS_OCAFVIS="$CAS_LDPATH -lTKCAF -lStdPlugin"
+ if test -f $CASROOT/$casdir/lib/libStdPlugin.so ; then
+ # this libraries are only for CASCADE 5.2.3
+ CAS_STDPLUGIN="StdPlugin"
+ fi
+
+ CAS_OCAF="$CAS_LDPATH -lPTKernel -lTKernel -lTKCDF -lTKLCAF -lTKPCAF -lTKStdSchema"
+ CAS_OCAFVIS="$CAS_LDPATH -lTKCAF -lStdPlugin -lStdLPlugin -lTKPLCAF -lTKPShape -lTKStdLSchema -lTKShapeSchema"
CAS_TKV3d="$CAS_LDPATH -lTKV3d"
CAS_VIEWER="$CAS_TKV3d -lTKService"
