From: pascale.noyret <pascale.noyret@edf.fr>
Date: Thu, 23 Mar 2017 16:42:50 +0000 (+0100)
Subject: modif installation MAP
X-Git-Tag: V8_3_0~67
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=268bd2d76f99d083df3e63f2c769d8f161b2b0f2;p=tools%2Feficas.git

modif installation MAP
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 358e7647..be6811fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,6 @@ endif (NOT PYUIC5)
 
 # Definition des options de CMake
 option ( WITH_ALL_PACKAGES "Install all package files" OFF )
-option ( WITH_MAP          "Install MAP files"         OFF )
 option ( WITH_CARMEL       "Install CARMEL files"      OFF )
 option ( WITH_SEP          "Install SEP files"         OFF )
 option ( WITH_ZCRACKS      "Install ZCRACKS files"     OFF )
@@ -89,7 +88,6 @@ option ( WITH_TELEMAC_CATA "Install TELEMAC files"     OFF )
 option ( IN_SALOME_CONTEXT "Configure Eficas for use in Salome" OFF )
 
 set ( _OPTIONLIST
-  WITH_MAP
   WITH_CARMEL
   WITH_TELEMAC_CATA
   )
@@ -114,11 +112,6 @@ if ( NOT ${_VALIDOPT} )
   message ( FATAL_ERROR "At least one option within ${_OPTIONLIST} must be selected" )
 endif ( NOT ${_VALIDOPT} )
 
-if (WITH_MAP)
-  find_package ( MAP REQUIRED )
-endif (WITH_MAP)
-
-
 
 
 # Parcours recursif des sous-repertoires
@@ -136,11 +129,6 @@ add_subdirectory ( generator )
 add_subdirectory ( Traducteur )
 
 
-# Installation des fichiers : MAP
-if (WITH_MAP)
-  add_subdirectory ( MAP )
-endif (WITH_MAP)
-
 # Installation des fichiers : CARMEL
 if (WITH_CARMEL)
   add_subdirectory ( Carmel3D )
@@ -148,10 +136,6 @@ if (WITH_CARMEL)
   add_subdirectory ( CarmelCS )
 endif (WITH_CARMEL)
 
-# Installation des fichiers : Sep
-if (WITH_SEP)
-  add_subdirectory ( Sep )
-endif (WITH_SEP)
 
 # Installation des fichiers : ZCracks
 if (WITH_ZCRACKS)
diff --git a/convert/CMakeLists.txt b/convert/CMakeLists.txt
index e7614b0f..ceedef9e 100644
--- a/convert/CMakeLists.txt
+++ b/convert/CMakeLists.txt
@@ -19,18 +19,12 @@
 #
 # ======================================================================
 
-install ( FILES __init__.py parseur_python.py convert_python.py
-                convert_file_from_template.py
+install ( FILES __init__.py parseur_python.py convert_python.py convert_TELEMAC.py
+                convert_file_from_template.py convert_map.py
           DESTINATION ${CMAKE_INSTALL_PREFIX}/convert
         )
 
 
-# Installation des fichiers : MAP
-if (WITH_MAP)
-  install ( FILES convert_map.py
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/convert
-          )
-endif (WITH_MAP)
 
 
 ### Local Variables:
diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
index 5b33fb6f..7cb26548 100644
--- a/generator/CMakeLists.txt
+++ b/generator/CMakeLists.txt
@@ -19,20 +19,14 @@
 #
 # ======================================================================
 
-install ( FILES __init__.py generator_python.py Formatage.py generator_aplat.py
-                generator_file_from_template.py
+install ( FILES __init__.py generator_python.py Formatage.py generator_aplat.py generator_TELEMAC.py
+                generator_file_from_template.py generator_map.py
           DESTINATION ${CMAKE_INSTALL_PREFIX}/generator
         )
 
 
 
 
-# Installation des fichiers : MAP
-if (WITH_MAP)
-  install ( FILES generator_map.py
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/generator
-          )
-endif (WITH_MAP)
 
 # Installation des fichiers : CARMEL
 if (WITH_CARMEL)
@@ -42,12 +36,6 @@ if (WITH_CARMEL)
 endif (WITH_CARMEL)
 
 
-# Installation des fichiers : SEP
-if (WITH_SEP)
-  install ( FILES generator_SEP.py tube.py
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/generator
-          )
-endif (WITH_SEP)
 
 
 ### Local Variables: