-# Copyright (C) 2010-2013 CEA/DEN, EDF R&D
+# Copyright (C) 2010-2014 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
# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
INCLUDE( ${PARAVIEW_USE_FILE} )
- FIND_PACKAGE( VTK 6.0 COMPONENTS vtkClientServer NO_MODULE)
+ FIND_PACKAGE( VTK COMPONENTS vtkClientServer NO_MODULE)
INCLUDE( ${VTK_USE_FILE} )
SET( PARACORBAPLUG_SRCS
ParaMEDCorbaUserInterfaceSources.xml
SERVER_MANAGER_SOURCES ${PARACORBAPLUG_SRCS} )
- INCLUDE_DIRECTORIES(${OMNIORB_INCLUDE_DIRS} ${MED_ROOT_DIR}/include/salome ${KERNEL_ROOT_DIR}/include/salome)
- SET_TARGET_PROPERTIES(ParaMEDMEM2VTK PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS}")
- SET_TARGET_PROPERTIES(ParaMEDCorbaPlugin PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS}")
+ INCLUDE_DIRECTORIES(${OMNIORB_INCLUDE_DIR} ${MED_ROOT_DIR}/include/salome ${KERNEL_ROOT_DIR}/include/salome)
+ ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
TARGET_LINK_LIBRARIES(ParaMEDMEM2VTK
#vtkCommon
vtkClientServer
pqCore
${OMNIORB_LIBRARIES}
- ${SalomeIDLMED}
- ${SalomeIDLKernel}
- ${QT_LIBS}
+ ${MED_SalomeIDLMED}
+ ${KERNEL_SalomeIDLKernel}
+ ${QT_LIBRARIES}
)
TARGET_LINK_LIBRARIES(ParaMEDCorbaPlugin
ParaMEDMEM2VTK
)
+ #Build library with a static runtime and ignore MSVCRT.lib on WINDOWS
+ IF(WIN32)
+ IF(CMAKE_BUILD_TYPE STREQUAL Debug)
+ SET_TARGET_PROPERTIES(ParaMEDMEM2VTK PROPERTIES LINK_FLAGS "/NODEFAULTLIB:MSVCRTD")
+ SET_TARGET_PROPERTIES(ParaMEDMEM2VTK PROPERTIES COMPILE_FLAGS "/MTd")
+ ELSE()
+ SET_TARGET_PROPERTIES(ParaMEDMEM2VTK PROPERTIES LINK_FLAGS "/NODEFAULTLIB:MSVCRT")
+ SET_TARGET_PROPERTIES(ParaMEDMEM2VTK PROPERTIES COMPILE_FLAGS "/MT")
+ ENDIF()
+ ENDIF(WIN32)
+
INSTALL(TARGETS ParaMEDCorbaPlugin DESTINATION lib/paraview)
INSTALL(TARGETS ParaMEDMEM2VTK DESTINATION lib/salome)