X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDLoader%2FCMakeLists.txt;h=b2f6e8e1c5cda183f13c57b5569cb6e220bb7104;hb=1b0f297f9ff050751963bb9bece9fd09f3156560;hp=4794ef2e3b7c13c5710fb86c53fbc8f01f5d0ef7;hpb=efda4aa0f0b010d87058479d926ee870c43bc32b;p=tools%2Fmedcoupling.git diff --git a/src/MEDLoader/CMakeLists.txt b/src/MEDLoader/CMakeLists.txt index 4794ef2e3..b2f6e8e1c 100644 --- a/src/MEDLoader/CMakeLists.txt +++ b/src/MEDLoader/CMakeLists.txt @@ -20,23 +20,23 @@ ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${XDR_DEFINITIONS}) -IF(SALOME_MED_ENABLE_PYTHON) +IF(MEDCOUPLING_ENABLE_PYTHON) ADD_SUBDIRECTORY(Swig) -ENDIF(SALOME_MED_ENABLE_PYTHON) +ENDIF(MEDCOUPLING_ENABLE_PYTHON) -IF(SALOME_BUILD_TESTS) +IF(MEDCOUPLING_BUILD_TESTS) ADD_SUBDIRECTORY(Test) -ENDIF(SALOME_BUILD_TESTS) +ENDIF(MEDCOUPLING_BUILD_TESTS) SET(MEDLOADER_XDR_INCLUDE_DIRS) SET(MEDLOADER_XDR_LIBRARIES) IF(WIN32) - IF(SALOME_MED_MEDLOADER_USE_XDR) + IF(MEDCOUPLING_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) + ENDIF(MEDCOUPLING_MEDLOADER_USE_XDR) ELSE(WIN32) SET(MEDLOADER_XDR_INCLUDE_DIRS ${XDR_INCLUDE_DIRS}) ENDIF(WIN32) @@ -63,6 +63,7 @@ SET(medloader_SOURCES MEDFileMeshLL.cxx MEDFileField.cxx MEDFileJoint.cxx + MEDFileEquivalence.cxx MEDFileParameter.cxx MEDFileData.cxx MEDFileFieldOverView.cxx @@ -75,10 +76,10 @@ SET(medloader_SOURCES ADD_LIBRARY(medloader SHARED ${medloader_SOURCES}) 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 ${MEDTOOL_INSTALL_LIBS}) +INSTALL(TARGETS medloader EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${MEDCOUPLING_INSTALL_LIBS}) FILE(GLOB medloader_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") -INSTALL(FILES ${medloader_HEADERS_HXX} DESTINATION ${MEDTOOL_INSTALL_HEADERS}) +INSTALL(FILES ${medloader_HEADERS_HXX} DESTINATION ${MEDCOUPLING_INSTALL_HEADERS}) # To allow usage as SWIG dependencies: SET(medloader_HEADERS_HXX PARENT_SCOPE)