X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParaMEDMEMComponent%2FCMakeLists.txt;h=acdf1f6924a2b3797ac1b25e89c7a2caf37ff0b4;hb=83e8c2e366e979fca040ac4ae86484847c01be15;hp=defab4c4d4e60a48eb44b6cabccd9d2cd28057ad;hpb=94d102d362379da8b0dc676e72a7af0a0a0af49a;p=modules%2Fmed.git

diff --git a/src/ParaMEDMEMComponent/CMakeLists.txt b/src/ParaMEDMEMComponent/CMakeLists.txt
index defab4c4d..acdf1f692 100644
--- a/src/ParaMEDMEMComponent/CMakeLists.txt
+++ b/src/ParaMEDMEMComponent/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2015  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,10 +17,11 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+ADD_DEFINITIONS(${MPI_DEFINITIONS} ${OMNIORB_DEFINITIONS})
+
 INCLUDE_DIRECTORIES(
-  ${OMNIORB_INCLUDE_DIRS}
+  ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
   ${MPI_INCLUDE_DIRS}
-  ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/../ParaMEDMEM
   ${CMAKE_CURRENT_SOURCE_DIR}/../ParaMEDCouplingCorba
@@ -36,9 +37,8 @@ SET(paramedmemcompo_SOURCES
   )
 
 ADD_LIBRARY(paramedmemcompo SHARED ${paramedmemcompo_SOURCES})
-SET_TARGET_PROPERTIES(paramedmemcompo PROPERTIES COMPILE_FLAGS "${MPI_DEFINITIONS} ${OMNIORB_DEFINITIONS}")
 TARGET_LINK_LIBRARIES(paramedmemcompo medcouplingcorba paramedmem)
-INSTALL(TARGETS paramedmemcompo DESTINATION ${MED_salomelib_LIBS})
+INSTALL(TARGETS paramedmemcompo DESTINATION ${SALOME_INSTALL_LIBS})
 
 FILE(GLOB paramedmemcompo_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
-INSTALL(FILES ${paramedmemcompo_HEADERS_HXX} DESTINATION ${MED_salomeinclude_HEADERS})
+INSTALL(FILES ${paramedmemcompo_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})