X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FINTERP_KERNELTest%2FCMakeLists.txt;h=68e8d4097ba6a197454174786fef9512e8397619;hb=c4551c56aa89896595842e5b41b048044681b4e8;hp=cb472024811d6e18fa064c2e30d03a4ba2c3b762;hpb=56e7b97b6270ad0b2d523070f937e0b8ebae0d30;p=tools%2Fmedcoupling.git

diff --git a/src/INTERP_KERNELTest/CMakeLists.txt b/src/INTERP_KERNELTest/CMakeLists.txt
index cb4720248..68e8d4097 100644
--- a/src/INTERP_KERNELTest/CMakeLists.txt
+++ b/src/INTERP_KERNELTest/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2016  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
@@ -20,12 +20,15 @@
 
 ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${XDR_DEFINITIONS} ${CPPUNIT_DEFINITIONS})
 
+IF(MEDCOUPLING_MICROMED)
+  ADD_DEFINITIONS(-DMEDCOUPLING_MICROMED)
+ENDIF()
+
 INCLUDE_DIRECTORIES(
   ${CPPUNIT_INCLUDE_DIRS}
   ${HDF5_INCLUDE_DIRS}
   ${MEDFILE_INCLUDE_DIRS}
   ${XDR_INCLUDE_DIRS}
-  ${CMAKE_CURRENT_SOURCE_DIR}/../MEDLoader
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Bases
@@ -34,6 +37,10 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Geometric2D
   )
 
+IF(NOT MEDCOUPLING_MICROMED)
+  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../MEDLoader)
+ENDIF()
+
 SET(InterpKernelTest_SOURCES
   BBTreeTest.cxx
   CppUnitTest.cxx
@@ -48,10 +55,13 @@ SET(InterpKernelTest_SOURCES
   TransformedTriangleTest.cxx
   UnitTetra3D2DIntersectionTest.cxx
   UnitTetraIntersectionBaryTest.cxx
-  TestInterpKernelUtils.cxx
   ThreeDSurfProjectionTest.cxx
 )
 
+SET(InterpKernelTestUtils_SOURCES
+    TestInterpKernelUtils.cxx
+)
+
 SET(TestINTERP_KERNEL_SOURCES
   TestInterpKernel.cxx
   )
@@ -60,7 +70,7 @@ SET(PerfTest_SOURCES
   PerfTest.cxx
   )
 
-IF(NOT MED_ENABLE_MICROMED)
+IF(NOT MEDCOUPLING_MICROMED)
   SET(InterpKernelTest_SOURCES
     ${InterpKernelTest_SOURCES}
     InterpolationOptionsTest.cxx
@@ -73,27 +83,32 @@ IF(NOT MED_ENABLE_MICROMED)
   ADD_EXECUTABLE(PerfTest ${PerfTest_SOURCES})
   TARGET_LINK_LIBRARIES(PerfTest InterpKernelTest ${CPPUNIT_LIBRARIES} ${PLATFORM_LIBS})
   INSTALL(TARGETS PerfTest DESTINATION ${MEDCOUPLING_INSTALL_BINS})
-ENDIF(NOT MED_ENABLE_MICROMED)
+ENDIF(NOT MEDCOUPLING_MICROMED)
 
-ADD_LIBRARY(InterpKernelTest SHARED ${InterpKernelTest_SOURCES})
+ADD_LIBRARY(InterpKernelTestUtils ${InterpKernelTestUtils_SOURCES})
+TARGET_LINK_LIBRARIES(InterpKernelTestUtils interpkernel)
+ADD_LIBRARY(InterpKernelTest ${InterpKernelTest_SOURCES})
 
-SET(InterpKernelTest_LIBS medcoupling interpkernel ${CPPUNIT_LIBRARIES})
-IF(NOT MED_ENABLE_MICROMED)
+SET(InterpKernelTest_LIBS medcouplingcpp interpkernel ${CPPUNIT_LIBRARIES})
+IF(NOT MEDCOUPLING_MICROMED)
   SET(InterpKernelTest_LIBS medloader ${InterpKernelTest_LIBS})
-ENDIF(NOT MED_ENABLE_MICROMED)
-TARGET_LINK_LIBRARIES(InterpKernelTest ${InterpKernelTest_LIBS})
+ENDIF(NOT MEDCOUPLING_MICROMED)
+TARGET_LINK_LIBRARIES(InterpKernelTest ${InterpKernelTest_LIBS} InterpKernelTestUtils)
 
 ADD_EXECUTABLE(TestINTERP_KERNEL ${TestINTERP_KERNEL_SOURCES})
 TARGET_LINK_LIBRARIES(TestINTERP_KERNEL InterpKernelTest ${CPPUNIT_LIBRARIES} ${PLATFORM_LIBS})
 ADD_TEST(TestINTERP_KERNEL TestINTERP_KERNEL)
+SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
+SET_TESTS_PROPERTIES(TestINTERP_KERNEL PROPERTIES ENVIRONMENT "${tests_env}")
 
 INSTALL(TARGETS TestINTERP_KERNEL DESTINATION ${MEDCOUPLING_INSTALL_BINS})
 INSTALL(TARGETS InterpKernelTest DESTINATION ${MEDCOUPLING_INSTALL_LIBS})
-INSTALL(FILES CppUnitTest.hxx InterpKernelTestExport.hxx DESTINATION ${MEDCOUPLING_INSTALL_HEADERS})
+INSTALL(TARGETS InterpKernelTestUtils DESTINATION ${MEDCOUPLING_INSTALL_LIBS})
+INSTALL(FILES CppUnitTest.hxx InterpKernelTestExport.hxx TestInterpKernelUtils.hxx DESTINATION ${MEDCOUPLING_INSTALL_HEADERS})
 
 # Application tests
 
-SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_TESTS}/MEDCoupling/INTERP_KERNELTest)
+SET(TEST_INSTALL_DIRECTORY ${MEDCOUPLING_INSTALL_TESTS}/INTERP_KERNELTest)
 INSTALL(TARGETS TestINTERP_KERNEL InterpKernelTest DESTINATION ${TEST_INSTALL_DIRECTORY})
 
 INSTALL(FILES CTestTestfileInstall.cmake