debug intempestif

[tools/eficas.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d85efc0eedb2b980b4ea15593f735b74a49a1dca..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,29 +81,15 @@ endif (NOT PYUIC5)
 
 # Definition des options de CMake
 option ( WITH_ALL_PACKAGES "Install all package files" OFF )
-option ( WITH_SALOME_MECA  "Install OT, Aster and SEP files" OFF )
-option ( WITH_OPENTURNS    "Install Open TURNS files"  OFF )
-option ( WITH_ASTER        "Install Aster 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 )
+option ( WITH_TELEMAC_CATA "Install TELEMAC files"     OFF )
 option ( IN_SALOME_CONTEXT "Configure Eficas for use in Salome" OFF )
 
 set ( _OPTIONLIST
-  WITH_OPENTURNS 
-  WITH_ASTER
-  WITH_MAP
   WITH_CARMEL
-  WITH_SALOME_MECA
-  )
-
-set ( _SALOME_MECA_LIST
-  WITH_OPENTURNS 
-  WITH_ASTER
-  WITH_SEP
-  WITH_ZCRACKS
-  IN_SALOME_CONTEXT
+  WITH_TELEMAC_CATA
   )
 
 if (WITH_ALL_PACKAGES)
@@ -112,11 +98,6 @@ if (WITH_ALL_PACKAGES)
   endforeach ( _opt )
 endif (WITH_ALL_PACKAGES)
 
-if (WITH_SALOME_MECA)
-  foreach ( _opt ${_SALOME_MECA_LIST} )
-    set ( ${_opt} ON )
-  endforeach ( _opt )
-endif (WITH_SALOME_MECA)
 
 # Verification: au moins une option doit etre selectionnee
 set ( _VALIDOPT FALSE )
@@ -131,28 +112,13 @@ if ( NOT ${_VALIDOPT} )
   message ( FATAL_ERROR "At least one option within ${_OPTIONLIST} must be selected" )
 endif ( NOT ${_VALIDOPT} )
 
-# Detection des prerequis lies aux options
-if (WITH_OPENTURNS)
-  if (IN_SALOME_CONTEXT)
-    SET(OpenTURNS_PYTHON_MODULE_DIR "")
-  else (IN_SALOME_CONTEXT)
-    find_package ( OpenTURNS REQUIRED )
-  endif (IN_SALOME_CONTEXT)
-endif (WITH_OPENTURNS)
-
-#if (WITH_ASTER)
-#  find_package ( Aster REQUIRED )
-#endif (WITH_ASTER)
-
-#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} )
@@ -163,29 +129,6 @@ add_subdirectory ( convert )
 add_subdirectory ( generator )
 add_subdirectory ( Traducteur )
 
-# Installation des fichiers : Open TURNS
-if (WITH_OPENTURNS)
-  add_subdirectory ( Openturns_Study )
-  add_subdirectory ( Openturns_Wrapper )
-endif (WITH_OPENTURNS)
-
-# Installation des fichiers : Aster
-if (WITH_ASTER)
-  add_subdirectory ( Aster )
-endif (WITH_ASTER)
-
-if (WITH_TK)
-  add_subdirectory ( InterfaceTK )
-  add_subdirectory ( Pmw )
-  add_subdirectory ( Tools )
-  add_subdirectory ( Misc )
-  add_subdirectory ( AIDE )
-endif (WITH_TK)
-
-# Installation des fichiers : MAP
-if (WITH_MAP)
-  add_subdirectory ( MAP )
-endif (WITH_MAP)
 
 # Installation des fichiers : CARMEL
 if (WITH_CARMEL)
@@ -194,16 +137,17 @@ 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)
   add_subdirectory ( ZCracks )
 endif (WITH_ZCRACKS)
 
+# Installation des fichiers : Telemac
+if (WITH_TELEMAC_CATA)
+  add_subdirectory ( Telemac )
+endif (WITH_TELEMAC_CATA)
+
 if (BUILD_DOC)
   add_subdirectory ( Doc )
 endif (BUILD_DOC)