From bb4770a11272ddeb8521d7ea486ef9152a8dfaad Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 23 Mar 2010 09:31:26 +0000 Subject: [PATCH] Compatibility cmake --- build_cmake | 30 +++++++++++++++++++ build_cmake.bat | 2 ++ .../GHS3DPRLPlugin_Hypothesis.cxx | 2 +- src/tepal2med/Makefile.am | 2 +- 4 files changed, 34 insertions(+), 2 deletions(-) create mode 100755 build_cmake create mode 100644 build_cmake.bat diff --git a/build_cmake b/build_cmake new file mode 100755 index 0000000..f627438 --- /dev/null +++ b/build_cmake @@ -0,0 +1,30 @@ +#!/bin/sh +# Copyright (C) 2007-2008 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 +# + +CURRENT_DIR=`pwd` +CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` +cd ${CONF_DIR} +python $KERNEL_ROOT_DIR/salome_adm/cmake_files/am2cmake.py --ghs3dprlplugin +status=$? +cd ${CURRENT_DIR} +exit $status diff --git a/build_cmake.bat b/build_cmake.bat new file mode 100644 index 0000000..3964461 --- /dev/null +++ b/build_cmake.bat @@ -0,0 +1,2 @@ + +%PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\am2cmake.py --ghs3dprlplugin diff --git a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.cxx b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.cxx index b08759c..bccf0f5 100755 --- a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.cxx +++ b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_Hypothesis.cxx @@ -21,7 +21,7 @@ // Author : Christian VAN WAMBEKE (CEA) (from Hexotic plugin Lioka RAZAFINDRAZAKA) // --- -#include +#include "GHS3DPRLPlugin_Hypothesis.hxx" #include //============================================================================= diff --git a/src/tepal2med/Makefile.am b/src/tepal2med/Makefile.am index 893c353..57ab243 100644 --- a/src/tepal2med/Makefile.am +++ b/src/tepal2med/Makefile.am @@ -44,6 +44,6 @@ BUILT_SOURCES = $(UIC_FILES) nodist_tepal2med_SOURCES = $(MOC_FILES) $(UIC_FILES) -tepal2med_CPPFLAGS = $(QT_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) $(LIBXML_INCLUDES) +tepal2med_CPPFLAGS = -I@builddir@ $(QT_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) $(LIBXML_INCLUDES) tepal2med_LDADD = $(QT_LIBS) $(MED2_LIBS) $(HDF5_LIBS) $(LIBXML_LIBS) -- 2.39.2