X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=c4296a583f2d3b850e06cde0e2422405fc5ecbef;hb=f4aa24df3388e118f0fcfc87e55f36c83a81c431;hp=4b959f11a1bea8f7d74710b07fb3a5a4dc1b32bf;hpb=29598d03eb207802a30ee5fb3f52cc8cbdc7c8da;p=tools%2Fmedcoupling.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4b959f11a..c4296a583 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,9 +1,9 @@ -# Copyright (C) 2012-2013 CEA/DEN, EDF R&D +# 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. +# 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 @@ -28,6 +28,9 @@ 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) @@ -58,19 +61,28 @@ ENDIF(SALOME_USE_MPI) IF(NOT SALOME_MED_STANDALONE) ADD_SUBDIRECTORY(MEDCouplingCorba) - ADD_SUBDIRECTORY(MEDCalculator) + IF(NOT SALOME_MED_MICROMED) + ADD_SUBDIRECTORY(MEDCalculator) + ADD_SUBDIRECTORY(MEDOP) + ENDIF(NOT SALOME_MED_MICROMED) IF(SALOME_MED_ENABLE_PYTHON) ADD_SUBDIRECTORY(MEDCouplingCorba_Swig) ENDIF(SALOME_MED_ENABLE_PYTHON) ENDIF(NOT SALOME_MED_STANDALONE) IF(SALOME_BUILD_GUI) - IF(NOT SALOME_MED_STANDALONE) - IF(NOT SALOME_MED_MICROMED) - IF(SALOME_MED_ENABLE_PYTHON) - #ADD_SUBDIRECTORY(MEDGUI) - ADD_SUBDIRECTORY(MEDOP) - ENDIF(SALOME_MED_ENABLE_PYTHON) - ENDIF(NOT SALOME_MED_MICROMED) - ENDIF(NOT SALOME_MED_STANDALONE) + 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)