X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCalculator%2FCMakeLists.txt;h=e36cb5325ebfbb36b20e1b2c8a5b245bdca0d43b;hb=10e479e70a8c12d2ed92af46375266826616cf2c;hp=73049d6648a644905e5262ef9182fb1c2c17cb18;hpb=cab567fe77709fc5c750e8c832308ed1c86adddb;p=modules%2Fmed.git diff --git a/src/MEDCalculator/CMakeLists.txt b/src/MEDCalculator/CMakeLists.txt index 73049d664..e36cb5325 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-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 @@ -18,22 +18,20 @@ # # Author : Anthony Geay (CEA/DEN) -ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${PLATFORM_DEFINITIONS}) +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_DIRS} - ${KERNEL_INCLUDE_DIRS} + ${PTHREAD_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../../idl ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCouplingCorba ${CMAKE_CURRENT_SOURCE_DIR}/../MEDLoader