From e3f8b92b7da6a2ca50465e2c349bca8bcd2f40f4 Mon Sep 17 00:00:00 2001 From: ageay Date: Thu, 4 Apr 2013 11:00:13 +0000 Subject: [PATCH] MEDMEM suppression --- src/INTERP_KERNELTest/CMakeLists.txt | 3 ++- src/INTERP_KERNELTest/Makefile.am | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/INTERP_KERNELTest/CMakeLists.txt b/src/INTERP_KERNELTest/CMakeLists.txt index 1a2750300..6011adb31 100644 --- a/src/INTERP_KERNELTest/CMakeLists.txt +++ b/src/INTERP_KERNELTest/CMakeLists.txt @@ -23,7 +23,8 @@ INCLUDE_DIRECTORIES( ${HDF5_INCLUDE_DIRS} ${MED3_INCLUDE_DIRS} ${XDR_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR}/../MEDMEM + ${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/ExprEval diff --git a/src/INTERP_KERNELTest/Makefile.am b/src/INTERP_KERNELTest/Makefile.am index 74363b60e..a0848ec52 100644 --- a/src/INTERP_KERNELTest/Makefile.am +++ b/src/INTERP_KERNELTest/Makefile.am @@ -94,10 +94,11 @@ if !MED_ENABLE_MICROMED libInterpKernelTest_la_CPPFLAGS += \ -DDISABLE_MICROMED \ $(MED3_INCLUDES) $(HDF5_INCLUDES) \ - -I$(srcdir)/../MEDMEM + -I$(srcdir)/../MEDLoader \ + -I$(srcdir)/../MEDCoupling libInterpKernelTest_la_LDFLAGS += \ - ../MEDMEM/libmedmem.la -lm + ../MEDLoader/libmedloader.la ../MEDCoupling/libmedcoupling.la -lm endif if MED_ENABLE_KERNEL -- 2.39.2