From: Cédric Aguerre Date: Wed, 28 Oct 2015 17:04:26 +0000 (+0100) Subject: MERGE stage 1: keep doc/dev and src/MEDCalc/doc X-Git-Tag: V8_0_0a1~5^2~27 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=10e479e70a8c12d2ed92af46375266826616cf2c;p=modules%2Fmed.git MERGE stage 1: keep doc/dev and src/MEDCalc/doc --- 10e479e70a8c12d2ed92af46375266826616cf2c diff --cc doc/dev/CMakeLists.txt.BACKUP.5306.txt index 000000000,000000000..d91183151 new file mode 100644 --- /dev/null +++ b/doc/dev/CMakeLists.txt.BACKUP.5306.txt @@@ -1,0 -1,0 +1,20 @@@ ++# Copyright (C) 2012-2015 CEA/DEN, EDF R&D ++# ++# 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, or (at your option) any later version. ++# ++# 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 ++# ++ ++ADD_SUBDIRECTORY(sphinx) diff --cc doc/dev/CMakeLists.txt.REMOTE.5306.txt index 000000000,000000000..d91183151 new file mode 100644 --- /dev/null +++ b/doc/dev/CMakeLists.txt.REMOTE.5306.txt @@@ -1,0 -1,0 +1,20 @@@ ++# Copyright (C) 2012-2015 CEA/DEN, EDF R&D ++# ++# 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, or (at your option) any later version. ++# ++# 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 ++# ++ ++ADD_SUBDIRECTORY(sphinx) diff --cc doc/user/doxygen/doxfiles/gui.dox index 000000000,061dd0883..6b0a53bf7 mode 000000,100644..100644 --- a/doc/user/doxygen/doxfiles/gui.dox +++ b/doc/user/doxygen/doxfiles/gui.dox @@@ -1,0 -1,23 +1,23 @@@ + /*! -\page gui Graphical user interface ++\page gui Graphical user interface + +

A graphical interface for standard use cases

+ + The MED module in SALOME comes with a graphical interface that helps + you deal with the most standard use cases of field manipulation. The + user guide can be found here: + + - User guide of the MED Graphical Interface ++ href="../../dev/MED/medcalc-userguide-gui.html">User guide of the MED Graphical Interface + + You could also be interested to read the software specifications and + requirements for this graphical module, and even the technical + considerations for development: + + - Software ++ href="../../dev/MED/medcalc-specifications.html">Software + specifications and requirements of the MED Graphical Interface (in french) + - Developer guide of the MED Graphical Interface (in french) ++ href="../../dev/MED/medcalc-develguide.html">Developer guide of the MED Graphical Interface (in french) + + */ diff --cc src/MEDCalc/CMakeLists.txt index 276489a86,000000000..1818efef3 mode 100644,000000..100644 --- a/src/MEDCalc/CMakeLists.txt +++ b/src/MEDCalc/CMakeLists.txt @@@ -1,34 -1,0 +1,30 @@@ +# Copyright (C) 2012-2015 CEA/DEN, EDF R&D +# +# 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, or (at your option) any later version. +# +# 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 +# + +ADD_SUBDIRECTORY(cmp) +ADD_SUBDIRECTORY(res) + +IF(SALOME_BUILD_GUI) + ADD_SUBDIRECTORY(gui) +ENDIF() + +IF(SALOME_MED_ENABLE_PYTHON) + ADD_SUBDIRECTORY(tui) + ADD_SUBDIRECTORY(exe) +ENDIF() - - IF(SALOME_BUILD_DOC) - ADD_SUBDIRECTORY(doc) - ENDIF(SALOME_BUILD_DOC)