X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=c4296a583f2d3b850e06cde0e2422405fc5ecbef;hb=f4aa24df3388e118f0fcfc87e55f36c83a81c431;hp=3ed0f1d4f02718b249ada71217f7622e1f864063;hpb=898721e086ec9084c77a86db3b45a2e58ef477ea;p=tools%2Fmedcoupling.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3ed0f1d4f..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 @@ -63,6 +63,7 @@ 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_MED_ENABLE_PYTHON) ADD_SUBDIRECTORY(MEDCouplingCorba_Swig) @@ -70,12 +71,18 @@ IF(NOT SALOME_MED_STANDALONE) 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)