X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDLoader%2FCMakeLists.txt;h=6d0ed57c660c19c23fb785c75b8514caa8365428;hb=cdd09520be1ff9d51b7f67e39fb0866bb71db901;hp=3c4e10bfdfd1c310a7b4a1379b014d806b9a0f38;hpb=56e7b97b6270ad0b2d523070f937e0b8ebae0d30;p=tools%2Fmedcoupling.git diff --git a/src/MEDLoader/CMakeLists.txt b/src/MEDLoader/CMakeLists.txt index 3c4e10bfd..6d0ed57c6 100644 --- a/src/MEDLoader/CMakeLists.txt +++ b/src/MEDLoader/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D +# Copyright (C) 2012-2016 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 @@ -20,9 +20,9 @@ ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${XDR_DEFINITIONS}) -IF(MEDCOUPLING_MED_ENABLE_PYTHON) +IF(MEDCOUPLING_ENABLE_PYTHON) ADD_SUBDIRECTORY(Swig) -ENDIF(MEDCOUPLING_MED_ENABLE_PYTHON) +ENDIF(MEDCOUPLING_ENABLE_PYTHON) IF(MEDCOUPLING_BUILD_TESTS) ADD_SUBDIRECTORY(Test) @@ -32,11 +32,11 @@ SET(MEDLOADER_XDR_INCLUDE_DIRS) SET(MEDLOADER_XDR_LIBRARIES) IF(WIN32) - IF(MEDCOUPLING_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(MEDCOUPLING_MED_MEDLOADER_USE_XDR) + ENDIF(MEDCOUPLING_MEDLOADER_USE_XDR) ELSE(WIN32) SET(MEDLOADER_XDR_INCLUDE_DIRS ${XDR_INCLUDE_DIRS}) ENDIF(WIN32) @@ -73,7 +73,7 @@ SET(medloader_SOURCES SauvWriter.cxx ) -ADD_LIBRARY(medloader SHARED ${medloader_SOURCES}) +ADD_LIBRARY(medloader ${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 ${MEDCOUPLING_INSTALL_LIBS})