X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDLoader%2FCMakeLists.txt;h=4b369a7151eab48a310ff37e9767dabbc6e61e36;hb=96bc4e98b56b27856dced632cdb6767afb411179;hp=7c9eaa4eaee804ea3c429796969ba8d686adbc48;hpb=f1a947b32a36d8dc8e3079b25305bb50e8cb59a0;p=tools%2Fmedcoupling.git

diff --git a/src/MEDLoader/CMakeLists.txt b/src/MEDLoader/CMakeLists.txt
index 7c9eaa4ea..4b369a715 100644
--- a/src/MEDLoader/CMakeLists.txt
+++ b/src/MEDLoader/CMakeLists.txt
@@ -18,12 +18,33 @@
 #
 # Author : Anthony Geay (CEA/DEN)
 
-ADD_SUBDIRECTORY(Swig)
-ADD_SUBDIRECTORY(Test)
+ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${XDR_DEFINITIONS})
+
+IF(SALOME_MED_ENABLE_PYTHON)
+  ADD_SUBDIRECTORY(Swig)
+ENDIF(SALOME_MED_ENABLE_PYTHON)
+
+IF(SALOME_BUILD_TESTS)
+  ADD_SUBDIRECTORY(Test)
+ENDIF(SALOME_BUILD_TESTS)
+
+SET(MEDLOADER_XDR_INCLUDE_DIRS)
+SET(MEDLOADER_XDR_LIBRARIES)
+
+IF(WIN32)
+  IF(SALOME_MED_MEDLOADER_USE_XDR)
+    ADD_DEFINITIONS(-DNOMINMAX)
+    SET(MEDLOADER_XDR_INCLUDE_DIRS ${XDR_INCLUDE_DIRS})
+    SET(MEDLOADER_XDR_LIBRARIES ${XDR_LIBRARIES})
+  ENDIF(SALOME_MED_MEDLOADER_USE_XDR)
+ELSE(WIN32)
+  SET(MEDLOADER_XDR_INCLUDE_DIRS ${XDR_INCLUDE_DIRS})
+ENDIF(WIN32)
 
 INCLUDE_DIRECTORIES(
-  ${MED3_INCLUDE_DIRS}
+  ${MEDFILE_INCLUDE_DIRS}
   ${HDF5_INCLUDE_DIRS}
+  ${MEDLOADER_XDR_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Bases
@@ -43,18 +64,20 @@ SET(medloader_SOURCES
   MEDFileField.cxx
   MEDFileParameter.cxx
   MEDFileData.cxx
+  MEDFileFieldOverView.cxx
+  MEDFileMeshReadSelector.cxx
   SauvMedConvertor.cxx
   SauvReader.cxx
   SauvWriter.cxx
   )
 
 ADD_LIBRARY(medloader SHARED ${medloader_SOURCES})
-SET_TARGET_PROPERTIES(medloader PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
-TARGET_LINK_LIBRARIES(medloader medcoupling ${MED3_LIBS_C_ONLY} ${HDF5_LIBS})
-INSTALL(TARGETS medloader DESTINATION ${MED_salomelib_LIBS})
+SET_TARGET_PROPERTIES(medloader PROPERTIES COMPILE_FLAGS "")
+TARGET_LINK_LIBRARIES(medloader medcoupling ${MEDFILE_C_LIBRARIES} ${HDF5_LIBRARIES} ${MEDLOADER_XDR_LIBRARIES})
+INSTALL(TARGETS medloader EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 FILE(GLOB medloader_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
-INSTALL(FILES ${medloader_HEADERS_HXX} DESTINATION ${MED_salomeinclude_HEADERS})
+INSTALL(FILES ${medloader_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})
 
 # To allow usage as SWIG dependencies:
 SET(medloader_HEADERS_HXX PARENT_SCOPE)