Merge remote branch 'origin/V7_4_BR'

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

diff --git a/src/ParaMEDMEMTest/CMakeLists.txt b/src/ParaMEDMEMTest/CMakeLists.txt
index 9b8f627a34e25268d67fdf6c9b80526f143aa9e1..b8aee15c4f3d9b013119d4fb25a5ac8058a70f0c 100644 (file)
--- a/src/ParaMEDMEMTest/CMakeLists.txt
+++ b/src/ParaMEDMEMTest/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2014  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
@@ -17,6 +17,8 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+ADD_DEFINITIONS(${MPI_DEFINITIONS} ${CPPUNIT_DEFINITIONS})
+
 INCLUDE_DIRECTORIES(
   ${MPI_INCLUDE_DIRS}
   ${CPPUNIT_INCLUDE_DIR}
@@ -35,7 +37,7 @@ SET(ParaMEDMEMTest_SOURCES
   ParaMEDMEMTest_InterpKernelDEC.cxx
   ParaMEDMEMTest_StructuredCoincidentDEC.cxx
   ParaMEDMEMTest_MEDLoader.cxx
-  ParaMEDMEMTest_ICocoTrio.cxx
+  ParaMEDMEMTest_ICoco.cxx
   ParaMEDMEMTest_Gauthier1.cxx
   ParaMEDMEMTest_FabienAPI.cxx
   ParaMEDMEMTest_NonCoincidentDEC.cxx
@@ -65,9 +67,9 @@ SET(ParaMEDMEMTest_SOURCES
   )
 
 ADD_LIBRARY(ParaMEDMEMTest SHARED ${ParaMEDMEMTest_SOURCES})
-SET_TARGET_PROPERTIES(ParaMEDMEMTest PROPERTIES COMPILE_FLAGS "${MPI_DEFINITIONS} ${CPPUNIT_DEFINITIONS}")
-TARGET_LINK_LIBRARIES(ParaMEDMEMTest paramedmem paramedloader ${CPPUNIT_LIBS})
-INSTALL(TARGETS ParaMEDMEMTest DESTINATION ${MED_salomelib_LIBS})
+SET_TARGET_PROPERTIES(ParaMEDMEMTest PROPERTIES COMPILE_FLAGS "")
+TARGET_LINK_LIBRARIES(ParaMEDMEMTest paramedmem paramedloader ${CPPUNIT_LIBRARIES})
+INSTALL(TARGETS ParaMEDMEMTest DESTINATION ${SALOME_INSTALL_LIBS})
 
 SET(TESTSParaMEDMEM)
 SET(TestParaMEDMEM_SOURCES
@@ -106,11 +108,10 @@ ENDIF(MPI2_IS_OK)
 
 FOREACH(bintestparamem ${TESTSParaMEDMEM})
   ADD_EXECUTABLE(${bintestparamem} ${${bintestparamem}_SOURCES})
-  SET_TARGET_PROPERTIES(${bintestparamem} PROPERTIES COMPILE_FLAGS "${MPI_FLGAS} ${CPPUNIT_DEFINITIONS}")
   TARGET_LINK_LIBRARIES(${bintestparamem} ParaMEDMEMTest)
 ENDFOREACH(bintestparamem ${TESTSParaMEDMEM})
 
-INSTALL(TARGETS ${TESTSParaMEDMEM} DESTINATION ${MED_salomebin_BINS})
+INSTALL(TARGETS ${TESTSParaMEDMEM} DESTINATION ${SALOME_INSTALL_BINS})
 SET(COMMON_HEADERS_HXX
   MPIMainTest.hxx
   MPIAccessDECTest.hxx
@@ -118,6 +119,4 @@ SET(COMMON_HEADERS_HXX
   ParaMEDMEMTest.hxx
   MPI2Connector.hxx
 )
-INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${MED_salomeinclude_HEADERS})
-
-                                       
\ No newline at end of file
+INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})