MERGE stage 1: keep doc/dev and src/MEDCalc/doc

diff --cc CMakeLists.txt
Simple merge

diff --cc doc/dev/CMakeLists.txt.BACKUP.5306.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d91183151c540210dac6b371fadd26ef8ff805ae
new file mode 100644 (file)
--- /dev/null
--- /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 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d91183151c540210dac6b371fadd26ef8ff805ae
new file mode 100644 (file)
--- /dev/null
--- /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 0000000000000000000000000000000000000000,061dd0883ea163021bcdac8a58512ee5b7dc51eb..6b0a53bf7fec74bc4ffaa035e65fd0155a35b1fd
mode 000000,100644..100644
--- /dev/null
--- 2/doc/user/doxygen/doxfiles/gui.dox
+++ b/doc/user/doxygen/doxfiles/gui.dox
@@@ -1,0 -1,23 +1,23 @@@
 -\page gui Graphical user interface 
+ /*!
 -  href="../../dev/MED/medop-userguide-gui.html">User guide of the MED Graphical Interface</a>
++\page gui Graphical user interface
+ 
+ <h1>A graphical interface for standard use cases</h1>
+ 
+ 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:
+ 
+ - <a class="el" target="_new"
 -  href="../../dev/MED/medop-specifications.html">Software
++  href="../../dev/MED/medcalc-userguide-gui.html">User guide of the MED Graphical Interface</a>
+ 
+ You could also be interested to read the software specifications and
+ requirements for this graphical module, and even the technical
+ considerations for development:
+ 
+ - <a class="el" target="_new"
 -  href="../../dev/MED/medop-develguide.html">Developer guide of the MED Graphical Interface (in french)</a>
++  href="../../dev/MED/medcalc-specifications.html">Software
+   specifications and requirements of the MED Graphical Interface (in french)</a>
+ - <a class="el" target="_new"
++  href="../../dev/MED/medcalc-develguide.html">Developer guide of the MED Graphical Interface (in french)</a>
+ 
+ */

diff --cc src/MEDCalc/CMakeLists.txt
index 276489a86278cead8c108b45e035f787cd92ea97,0000000000000000000000000000000000000000..1818efef3f1a87643d94776705db1b3333669a5b
mode 100644,000000..100644
--- 1/src/MEDCalc/CMakeLists.txt
--- /dev/null
+++ b/src/MEDCalc/CMakeLists.txt
@@@ -1,34 -1,0 +1,30 @@@
- 
- IF(SALOME_BUILD_DOC)
-   ADD_SUBDIRECTORY(doc)
- ENDIF(SALOME_BUILD_DOC)
 +# 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()