X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FINTERP_KERNELTest%2FCMakeLists.txt;h=303c049106c797b1e2d48c179f09cf23980b7e47;hb=bfde38f9bd0c1c3e4a4f8375559393a9f0ba27c3;hp=aa3a53b38b4c0fb33ec36fb1e9266091311449f5;hpb=a647d17ef9e201c9fe08e9ebaf165dd7e22697b7;p=tools%2Fmedcoupling.git

diff --git a/src/INTERP_KERNELTest/CMakeLists.txt b/src/INTERP_KERNELTest/CMakeLists.txt
index aa3a53b38..303c04910 100644
--- a/src/INTERP_KERNELTest/CMakeLists.txt
+++ b/src/INTERP_KERNELTest/CMakeLists.txt
@@ -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
@@ -33,6 +36,10 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/GaussPoints
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Geometric2D
   )
+  
+IF(NOT MEDCOUPLING_MICROMED)
+  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../MEDLoader)
+ENDIF()
 
 SET(InterpKernelTest_SOURCES
   BBTreeTest.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 MEDCOUPLING_MED_MICROMED)
+IF(NOT MEDCOUPLING_MICROMED)
   SET(InterpKernelTest_SOURCES
     ${InterpKernelTest_SOURCES}
     InterpolationOptionsTest.cxx
@@ -73,25 +83,28 @@ IF(NOT MEDCOUPLING_MED_MICROMED)
   ADD_EXECUTABLE(PerfTest ${PerfTest_SOURCES})
   TARGET_LINK_LIBRARIES(PerfTest InterpKernelTest ${CPPUNIT_LIBRARIES} ${PLATFORM_LIBS})
   INSTALL(TARGETS PerfTest DESTINATION ${MEDCOUPLING_INSTALL_BINS})
-ENDIF(NOT MEDCOUPLING_MED_MICROMED)
+ENDIF(NOT MEDCOUPLING_MICROMED)
 
+ADD_LIBRARY(InterpKernelTestUtils SHARED ${InterpKernelTestUtils_SOURCES})
+TARGET_LINK_LIBRARIES(InterpKernelTestUtils interpkernel)
 ADD_LIBRARY(InterpKernelTest SHARED ${InterpKernelTest_SOURCES})
 
 SET(InterpKernelTest_LIBS medcoupling interpkernel ${CPPUNIT_LIBRARIES})
-IF(NOT MEDCOUPLING_MED_MICROMED)
+IF(NOT MEDCOUPLING_MICROMED)
   SET(InterpKernelTest_LIBS medloader ${InterpKernelTest_LIBS})
-ENDIF(NOT MEDCOUPLING_MED_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)
+ADD_TEST(TestINTERP_KERNEL TestINTERP_KERNEL)
 SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
-#SET_TESTS_PROPERTIES(TestINTERP_KERNEL PROPERTIES 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