debug intempestif

[tools/eficas.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 358e76470d8cfa922dac85549b5162469d62362f..164af95d68d0c9e91b7548e56594bdc61f1d7678 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,14 +27,14 @@ project ( Eficas CXX C )
 set ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules" )
 
 # Detection de Python
-find_package ( PythonInterp 2.4 REQUIRED )
+find_package ( PythonInterp  REQUIRED )
 if (PYTHONINTERP_FOUND)
   string ( RANDOM tmpPyScript )
   set ( tmpPyScript "${tmpPyScript}.py" )
   file ( WRITE  ${tmpPyScript}
 "# Automaticaly generated by CMake. Do NOT edit. Changes will be lost
 import sys
-print '%d.%d' % ( sys.version_info[0], sys.version_info[1] )
+print ('%d.%d' % ( sys.version_info[0], sys.version_info[1] ))
 " )
   get_source_file_property ( PYSCRIPT_LOC ${tmpPyScript} LOCATION )
   execute_process ( COMMAND ${PYTHON_EXECUTABLE} ${PYSCRIPT_LOC}
@@ -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,17 +112,13 @@ 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
 add_subdirectory ( Accas )
 add_subdirectory ( Aide )
 add_subdirectory ( Editeur )
+add_subdirectory ( Efi2Xsd )
 add_subdirectory ( Extensions )
 add_subdirectory ( Ihm )
 install ( DIRECTORY InterfaceQT4 DESTINATION ${CMAKE_INSTALL_PREFIX} )
@@ -136,11 +130,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 +137,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)