Compilation SALOME by CMake(windows/linux)

diff --git a/src/MEDOP/cmp/CMakeLists.txt b/src/MEDOP/cmp/CMakeLists.txt
index 18f5402defcf77ede9a34a650c6370c5db8e468f..34cd71d75a22604551857c9893966987f62ad0b1 100644 (file)
--- a/src/MEDOP/cmp/CMakeLists.txt
+++ b/src/MEDOP/cmp/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -21,24 +21,48 @@ INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIRS}
   ${MED3_INCLUDE_DIRS}
   ${HDF5_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
-  ${CMAKE_CURRENT_BINARY_DIR}/../../../idl
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDLoader
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL/Bases
-  )
+  ${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
+)
 
 SET(MEDOPFactoryEngine_SOURCES
   MEDDataManager_i.cxx
   MEDCalculator_i.cxx
   MEDOPFactory_i.cxx
-  )
+)
+SET(COMMON_LIBS
+  medloader
+  SalomeIDLMED
+  ${TOOLSDS}
+  ${SalomeHDFPersist}
+  ${SalomeContainer}
+  ${SalomeCommunication}
+  ${SalomeKernelHelpers}
+  ${SalomeLifeCycleCORBA})
+  ${SALOMELocalTrace}
+  ${SALOMEBasics} 
+  ${SalomeGenericObj}
+  medcoupling
+  interpkernel
+  ${MED3_LIBS}
+  ${HDF5_LIBS}
+  ${OMNIORB_LIBS}
+  ${PLATFORM_LIBS}
+)
 
 ADD_LIBRARY(MEDOPFactoryEngine SHARED ${MEDOPFactoryEngine_SOURCES})
-SET_TARGET_PROPERTIES(MEDOPFactoryEngine PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${OMNIORB_DEFINITIONS}")
-TARGET_LINK_LIBRARIES(MEDOPFactoryEngine medloader SalomeIDLMED ${TOOLSDS} ${SalomeHDFPersist} ${SalomeContainer} ${SalomeCommunication} ${SalomeKernelHelpers} ${SalomeLifeCycleCORBA})
+SET_TARGET_PROPERTIES(MEDOPFactoryEngine PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${PLATFORM_DEFINITIONS} ${OMNIORB_DEFINITIONS}")
+TARGET_LINK_LIBRARIES(MEDOPFactoryEngine SalomeIDLMED ${COMMON_LIBS})
+
 INSTALL(TARGETS MEDOPFactoryEngine DESTINATION ${MED_salomelib_LIBS})
 
 FILE(GLOB MEDOPFactoryEngine_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
 INSTALL(FILES ${MEDOPFactoryEngine_HEADERS_HXX} DESTINATION ${MED_salomeinclude_HEADERS})
+
+INSTALL(FILES test_medop_components.py PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ DESTINATION ${MED_salomebin_BINS}/xmed)
\ No newline at end of file

diff --git a/src/MEDOP/tui/xmedpy/CMakeLists.txt b/src/MEDOP/tui/xmedpy/CMakeLists.txt
index b90a531bba138acd1a7ce54aeeaf9779d9489f8e..d2e4afc59330ccb8c8de9efcaa15039fcff0d080 100644 (file)
--- a/src/MEDOP/tui/xmedpy/CMakeLists.txt
+++ b/src/MEDOP/tui/xmedpy/CMakeLists.txt
@@ -17,6 +17,8 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+INCLUDE(${SALOME_MACROS_DIR}/InstallAndCompilePythonFile.cmake)
+
 SET(PYFILES_TO_INSTALL
   __init__.py
   fieldproxy.py
@@ -32,10 +34,12 @@ SET(PYFILES_TO_INSTALL
   properties.py
   )
 
-INSTALL_AND_COMPILE_PYTHON_FILE("${PYFILES_TO_INSTALL}" ${MED_salomescript_PYTHON}/xmed)
+INSTALL_AND_COMPILE_PYTHON_FILE("${PYFILES_TO_INSTALL}" ${MED_salomepythondir}/xmed)
 
 SET(TEST_SCRIPTS_XMED
   tests/test_xmed_fieldOperations.py
   tests/test_xmed_uiEventListener.py
   tests/test_xmed_visualisation.py
   )
+
+INSTALL(FILES ${TEST_SCRIPTS_XMED} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ DESTINATION ${MED_salomebin_BINS}/xmed)
\ No newline at end of file