[MEDCalc] Manage color maps

[modules/med.git] / src / MEDCalculator / CMakeLists.txt

diff --git a/src/MEDCalculator/CMakeLists.txt b/src/MEDCalculator/CMakeLists.txt
index de7d054978b1a458ae88a37682902454632b7ab6..2cdb9b105552d5836064f838f7b67c35156dfead 100644 (file)
--- 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,31 +18,23 @@
 #
 # 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_ROOT_DIR}/include/salome
+  ${PTHREAD_INCLUDE_DIR}
+  ${MEDCOUPLING_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCouplingCorba
-  ${CMAKE_CURRENT_SOURCE_DIR}/../MEDLoader
-  ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling
-  ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL
-  ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Bases
-  ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Geometric2D
-  ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/ExprEval
-  ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/GaussPoints
   )
 
 SET(medcalculator_SOURCES
@@ -56,8 +48,8 @@ SET(medcalculator_SOURCES
 )
 
 ADD_LIBRARY(medcalculator SHARED ${medcalculator_SOURCES})
-TARGET_LINK_LIBRARIES(medcalculator medloader medcouplingcorba ${KERNEL_LDFLAGS} 
-  ${KERNEL_SALOMELocalTrace} ${KERNEL_SalomeNS} ${KERNEL_OpUtil} 
+TARGET_LINK_LIBRARIES(medcalculator ${MEDCoupling_medloader} medcouplingcorba ${KERNEL_LDFLAGS}
+  ${KERNEL_SALOMELocalTrace} ${KERNEL_SalomeNS} ${KERNEL_OpUtil}
   ${OMNIORB_LIBRARIES} ${PLATFORM_LIBRARIES})
 INSTALL(TARGETS medcalculator DESTINATION ${SALOME_INSTALL_LIBS})