From 218ab1145b36237a9340b5401a6f80f90cafcf9e Mon Sep 17 00:00:00 2001 From: jfa Date: Fri, 12 Aug 2011 13:01:50 +0000 Subject: [PATCH] Porting to OCCT6.5.1 --- src/Basics/Basics_OCCTVersion.hxx | 40 +++++++++++++++++++++++++++++++ src/Basics/Makefile.am | 6 ++--- 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 src/Basics/Basics_OCCTVersion.hxx diff --git a/src/Basics/Basics_OCCTVersion.hxx b/src/Basics/Basics_OCCTVersion.hxx new file mode 100644 index 000000000..2ed3192c6 --- /dev/null +++ b/src/Basics/Basics_OCCTVersion.hxx @@ -0,0 +1,40 @@ +// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + +// File : Basics_OCCTVersion.hxx +// Author : Julia DOROVSKIKH, Open CASCADE S.A.S (julia.dorovskikh@opencascade.com) + +#ifndef BASICS_OCCTVERSION_HXX +#define BASICS_OCCTVERSION_HXX + +#include + +#ifdef OCC_VERSION_SERVICEPACK +# define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8 | OCC_VERSION_SERVICEPACK) +#else +# ifdef OCC_VERSION_DEVELOPMENT +# define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8 | 1) +# else +# define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8) +# endif +#endif + +#endif // BASICS_OCCTVERSION_HXX diff --git a/src/Basics/Makefile.am b/src/Basics/Makefile.am index 952acee77..0896f2326 100644 --- a/src/Basics/Makefile.am +++ b/src/Basics/Makefile.am @@ -18,21 +18,21 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# # Basics: General purpose C++ # File : Makefile.in # Author : Paul RASCLE (EDF) # Module : SALOME # $Header$ -# + include $(top_srcdir)/salome_adm/unix/make_common_starter.am salomeinclude_HEADERS = \ SALOME_Basics.hxx \ BasicsGenericDestructor.hxx \ Basics_Utils.hxx \ - Basics_DirUtils.hxx + Basics_DirUtils.hxx \ + Basics_OCCTVersion.hxx lib_LTLIBRARIES = libSALOMEBasics.la libSALOMEBasics_la_SOURCES = \ -- 2.39.2