Addition of tools for combination of part definition for // manip.

[tools/medcoupling.git] / src / MEDOP / cmp / CMakeLists.txt

diff --git a/src/MEDOP/cmp/CMakeLists.txt b/src/MEDOP/cmp/CMakeLists.txt
index 1f2675dce5b7b63bb30ee428229041b313ae93ac..f55ccecbd7cfc397376fa1530bd667f20f961cb5 100644 (file)
--- a/src/MEDOP/cmp/CMakeLists.txt
+++ b/src/MEDOP/cmp/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,20 +17,19 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${PLATFORM_DEFINITIONS} ${OMNIORB_DEFINITIONS})
+ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${OMNIORB_DEFINITIONS})
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
   ${MEDFILE_INCLUDE_DIRS}
   ${HDF5_INCLUDE_DIRS}
-  ${PTHREAD_INCLUDE_DIRS}
-  ${KERNEL_ROOT_DIR}/include/salome
+  ${PTHREAD_INCLUDE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/idl
-  ${CMAKE_SOURCE_DIR}/src/MEDCoupling
-  ${CMAKE_SOURCE_DIR}/src/INTERP_KERNEL/Bases
-  ${CMAKE_SOURCE_DIR}/src/INTERP_KERNEL
-  ${CMAKE_SOURCE_DIR}/src/MEDLoader
+  ${PROJECT_BINARY_DIR}/idl
+  ${PROJECT_SOURCE_DIR}/src/MEDCoupling
+  ${PROJECT_SOURCE_DIR}/src/INTERP_KERNEL/Bases
+  ${PROJECT_SOURCE_DIR}/src/INTERP_KERNEL
+  ${PROJECT_SOURCE_DIR}/src/MEDLoader
 )
 
 SET(MEDOPFactoryEngine_SOURCES
@@ -41,16 +40,17 @@ SET(MEDOPFactoryEngine_SOURCES
 SET(COMMON_LIBS
   medloader
   SalomeIDLMED
-  ${TOOLSDS}
-  ${SalomeHDFPersist}
-  ${SalomeContainer}
-  ${SalomeCommunication}
-  ${SalomeKernelHelpers}
-  ${SalomeLifeCycleCORBA}
-  ${SALOMELocalTrace}
-  ${SALOMEBasics} 
-  ${SalomeGenericObj}
+  ${KERNEL_TOOLSDS}
+  ${KERNEL_SalomeHDFPersist}
+  ${KERNEL_SalomeContainer}
+  ${KERNEL_SalomeCommunication}
+  ${KERNEL_SalomeKernelHelpers}
+  ${KERNEL_SalomeLifeCycleCORBA}
+  ${KERNEL_SALOMELocalTrace}
+  ${KERNEL_SALOMEBasics}
+  ${KERNEL_SalomeGenericObj}
   medcoupling
+  medcouplingremapper
   interpkernel
   ${MEDFILE_C_LIBRARIES}
   ${HDF5_LIBRARIES}
@@ -58,7 +58,7 @@ SET(COMMON_LIBS
   ${PLATFORM_LIBRARIES}
 )
 
-# This undefines the macros MIN and MAX which are specified in the windows headers 
+# This undefines the macros MIN and MAX which are specified in the windows headers
 IF(WIN32)
   SET(COMMON_FLAGS "${COMMON_FLAGS} -DNOMINMAX")
 ENDIF(WIN32)
@@ -72,4 +72,6 @@ INSTALL(TARGETS MEDOPFactoryEngine DESTINATION ${SALOME_INSTALL_LIBS})
 FILE(GLOB MEDOPFactoryEngine_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
 INSTALL(FILES ${MEDOPFactoryEngine_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})
 
-INSTALL(FILES test_medop_components.py PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ DESTINATION ${SALOME_INSTALL_BINS}/xmed)
+IF(SALOME_ENABLE_PYTHON)
+  INSTALL(FILES test_medop_components.py PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ DESTINATION ${SALOME_INSTALL_BINS}/xmed)
+ENDIF()