X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCalculator%2FCMakeLists.txt;h=ddbfbac36ea9e6f5020be41469122fec7b692160;hb=62a3e1a7f12332a2fd01f5751b9f5ca99b8727e1;hp=0417d5c4f451ef6f7e071b61735876f364712ba2;hpb=4a8694e2c6bbc95f4d1f7583d8d8b945892eb74c;p=tools%2Fmedcoupling.git diff --git a/src/MEDCalculator/CMakeLists.txt b/src/MEDCalculator/CMakeLists.txt index 0417d5c4f..ddbfbac36 100644 --- a/src/MEDCalculator/CMakeLists.txt +++ b/src/MEDCalculator/CMakeLists.txt @@ -1,9 +1,9 @@ -# Copyright (C) 2012-2013 CEA/DEN, EDF R&D +# Copyright (C) 2012-2014 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 @@ -22,18 +22,16 @@ ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${OMNIORB_DEFINITIONS IF(SALOME_MED_ENABLE_PYTHON) ADD_SUBDIRECTORY(Swig) + IF(SALOME_BUILD_TESTS) + ADD_SUBDIRECTORY(Test) + ENDIF(SALOME_BUILD_TESTS) ENDIF(SALOME_MED_ENABLE_PYTHON) -IF(SALOME_BUILD_TESTS) - ADD_SUBDIRECTORY(Test) -ENDIF(SALOME_BUILD_TESTS) - INCLUDE_DIRECTORIES( ${MEDFILE_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} - ${KERNEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../idl ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCouplingCorba ${CMAKE_CURRENT_SOURCE_DIR}/../MEDLoader