X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=2489e0a02bf649df77c6647ceebbc3963586775f;hb=9035b099306caa77f2c2d2df8d93dcf36a55bb9a;hp=c4296a583f2d3b850e06cde0e2422405fc5ecbef;hpb=ae1423eb21bb61e9a19a21a990e1c83118d0425e;p=modules%2Fmed.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c4296a583..2489e0a02 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,72 +17,20 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-ADD_SUBDIRECTORY(INTERP_KERNEL)
-ADD_SUBDIRECTORY(MEDCoupling)
+IF(SALOME_USE_MPI)
+  ADD_SUBDIRECTORY(ParaMEDCouplingCorba)
+  ADD_SUBDIRECTORY(ParaMEDMEMComponent)
+ENDIF(SALOME_USE_MPI)
 
+ADD_SUBDIRECTORY(MEDCouplingCorba)
+ADD_SUBDIRECTORY(MEDCalculator)
+ADD_SUBDIRECTORY(MEDCalc)
 IF(SALOME_MED_ENABLE_PYTHON)
-  ADD_SUBDIRECTORY(MEDCoupling_Swig)
+  ADD_SUBDIRECTORY(MEDCouplingCorba_Swig)
 ENDIF(SALOME_MED_ENABLE_PYTHON)
 
-IF(NOT SALOME_MED_MICROMED)
-  ADD_SUBDIRECTORY(MEDLoader)
-  IF(SALOME_MED_ENABLE_RENUMBER)
-    ADD_SUBDIRECTORY(RENUMBER)
-    IF(SALOME_MED_ENABLE_PYTHON)
-      ADD_SUBDIRECTORY(RENUMBER_Swig)
-    ENDIF(SALOME_MED_ENABLE_PYTHON)
-  ENDIF(SALOME_MED_ENABLE_RENUMBER)
-  IF(SALOME_MED_ENABLE_PARTITIONER)
-    ADD_SUBDIRECTORY(MEDPartitioner)
-  ENDIF(SALOME_MED_ENABLE_PARTITIONER)
-  IF(SALOME_BUILD_TESTS)
-    ADD_SUBDIRECTORY(INTERP_KERNELTest)
-  ENDIF(SALOME_BUILD_TESTS)
-ENDIF(NOT SALOME_MED_MICROMED)
-
-IF(SALOME_USE_MPI)
-  ADD_SUBDIRECTORY(ParaMEDMEM)
-  IF(NOT SALOME_MED_MICROMED)
-    ADD_SUBDIRECTORY(ParaMEDLoader)
-  ENDIF(NOT SALOME_MED_MICROMED)
-  IF(NOT SALOME_MED_STANDALONE)
-    ADD_SUBDIRECTORY(ParaMEDCouplingCorba)
-    ADD_SUBDIRECTORY(ParaMEDMEMComponent)
-  ENDIF(NOT SALOME_MED_STANDALONE)
-  IF(SALOME_MED_ENABLE_PYTHON)
-    ADD_SUBDIRECTORY(ParaMEDMEM_Swig)
-  ENDIF(SALOME_MED_ENABLE_PYTHON)
-  IF(SALOME_BUILD_TESTS)
-    IF(NOT SALOME_MED_MICROMED)
-      ADD_SUBDIRECTORY(ParaMEDMEMTest)
-    ENDIF(NOT SALOME_MED_MICROMED)
-  ENDIF(SALOME_BUILD_TESTS)
-ENDIF(SALOME_USE_MPI)
-
-IF(NOT SALOME_MED_STANDALONE)
-  ADD_SUBDIRECTORY(MEDCouplingCorba)
-  IF(NOT SALOME_MED_MICROMED)
-    ADD_SUBDIRECTORY(MEDCalculator)
-    ADD_SUBDIRECTORY(MEDOP)
-  ENDIF(NOT SALOME_MED_MICROMED)
+IF(SALOME_BUILD_GUI)
   IF(SALOME_MED_ENABLE_PYTHON)
-    ADD_SUBDIRECTORY(MEDCouplingCorba_Swig)
+    #ADD_SUBDIRECTORY(MEDGUI)
   ENDIF(SALOME_MED_ENABLE_PYTHON)
-ENDIF(NOT SALOME_MED_STANDALONE)
-
-IF(SALOME_BUILD_GUI)
-  IF(NOT SALOME_MED_MICROMED)
-    IF(SALOME_MED_ENABLE_PYTHON)
-      #ADD_SUBDIRECTORY(MEDGUI)
-    ENDIF(SALOME_MED_ENABLE_PYTHON)
-  ENDIF(NOT SALOME_MED_MICROMED)
 ENDIF(SALOME_BUILD_GUI)
-
-# Application tests
-INSTALL(FILES CTestTestfileInstall.cmake
-  DESTINATION ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test
-  RENAME CTestTestfile.cmake)
-
-INSTALL(FILES CTestTestfileInstallMEDCoupling.cmake
-  DESTINATION ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/MEDCoupling
-  RENAME CTestTestfile.cmake)