X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FCMakeLists.txt;h=d668ac8c26e2a45153cc75ebc814c103a72f3fb4;hb=e7835cba1eb17f50ef4e130c2cb8d0f54bc25083;hp=34ae94365739c5d7fd0f1fc605174c723d171c06;hpb=de984d79297bf264905c1da9af643b99b7f1d05e;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling/CMakeLists.txt b/src/MEDCoupling/CMakeLists.txt index 34ae94365..d668ac8c2 100644 --- a/src/MEDCoupling/CMakeLists.txt +++ b/src/MEDCoupling/CMakeLists.txt @@ -22,6 +22,9 @@ IF(MEDCOUPLING_BUILD_TESTS) ADD_SUBDIRECTORY(Test) ENDIF(MEDCOUPLING_BUILD_TESTS) +### KILLER WARNINGS TO HELP INT64 MANAGEMENT +#ADD_DEFINITIONS(-Wextra -Wsynth -Wno-unused-parameter -pedantic -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wreturn-type -Wno-endif-labels -Wsign-compare -Wmissing-format-attribute -Wno-multichar -Wno-deprecated-declarations -Wpacked -Wredundant-decls -Wlong-long -Wdisabled-optimization -Wunknown-pragmas -Wundef -Wreorder) + INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/../.. ${CMAKE_CURRENT_SOURCE_DIR} @@ -34,6 +37,7 @@ INCLUDE_DIRECTORIES( SET(medcoupling_SOURCES MEDCouplingField.cxx + MEDCouplingFieldFloat.cxx MEDCouplingFieldDouble.cxx MEDCouplingFieldInt.cxx MEDCouplingUMesh.cxx @@ -41,7 +45,9 @@ SET(medcoupling_SOURCES MEDCouplingUMesh_intersection.cxx MEDCoupling1GTUMesh.cxx MEDCouplingMemArray.cxx + MEDCouplingMemArrayFloat.cxx MEDCouplingMemArrayChar.cxx + MEDCouplingMap.cxx MEDCouplingTraits.cxx MEDCouplingTimeLabel.cxx MEDCouplingCMesh.cxx @@ -74,12 +80,13 @@ SET(medcouplingremapper_SOURCES MEDCouplingRemapper.cxx ) -ADD_LIBRARY(medcoupling ${medcoupling_SOURCES}) -TARGET_LINK_LIBRARIES(medcoupling interpkernel) -INSTALL(TARGETS medcoupling EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${MEDCOUPLING_INSTALL_LIBS}) +ADD_LIBRARY(medcouplingcpp ${medcoupling_SOURCES}) +SET_TARGET_PROPERTIES(medcouplingcpp PROPERTIES OUTPUT_NAME "medcoupling") +TARGET_LINK_LIBRARIES(medcouplingcpp interpkernel) +INSTALL(TARGETS medcouplingcpp EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${MEDCOUPLING_INSTALL_LIBS}) ADD_LIBRARY(medcouplingremapper ${medcouplingremapper_SOURCES}) -TARGET_LINK_LIBRARIES(medcouplingremapper medcoupling) +TARGET_LINK_LIBRARIES(medcouplingremapper medcouplingcpp) INSTALL(TARGETS medcouplingremapper EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${MEDCOUPLING_INSTALL_LIBS}) FILE(GLOB medcoupling_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")