X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FINTERP_KERNELTest%2FCMakeLists.txt;h=68e8d4097ba6a197454174786fef9512e8397619;hb=c4551c56aa89896595842e5b41b048044681b4e8;hp=6a8cfb2b036fd309fee0cd40eb77a31d1e300678;hpb=9f966e0ed55cc976b59a17318a7be82445529eda;p=tools%2Fmedcoupling.git diff --git a/src/INTERP_KERNELTest/CMakeLists.txt b/src/INTERP_KERNELTest/CMakeLists.txt index 6a8cfb2b0..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 @@ -36,7 +36,7 @@ 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() @@ -85,10 +85,11 @@ IF(NOT MEDCOUPLING_MICROMED) INSTALL(TARGETS PerfTest DESTINATION ${MEDCOUPLING_INSTALL_BINS}) ENDIF(NOT MEDCOUPLING_MICROMED) -ADD_LIBRARY(InterpKernelTestUtils SHARED ${InterpKernelTestUtils_SOURCES}) -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}) +SET(InterpKernelTest_LIBS medcouplingcpp interpkernel ${CPPUNIT_LIBRARIES}) IF(NOT MEDCOUPLING_MICROMED) SET(InterpKernelTest_LIBS medloader ${InterpKernelTest_LIBS}) ENDIF(NOT MEDCOUPLING_MICROMED) @@ -107,7 +108,7 @@ INSTALL(FILES CppUnitTest.hxx InterpKernelTestExport.hxx TestInterpKernelUtils.h # 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