X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEFISTO2%2FCMakeLists.txt;h=05e39b1b2c9cc9865f26c61d8bd2d74494b6d961;hb=14866e630942b5bf53793305c8d01ac390534795;hp=00770e8106b8091cabcbf073ad7bd12fd4cd0325;hpb=2b4292d02d0b3b65f754fd1e8aa0aee51d747477;p=modules%2Fsmesh.git

diff --git a/src/MEFISTO2/CMakeLists.txt b/src/MEFISTO2/CMakeLists.txt
index 00770e810..05e39b1b2 100644
--- a/src/MEFISTO2/CMakeLists.txt
+++ b/src/MEFISTO2/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # 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
@@ -21,20 +21,19 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${KERNEL_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${HDF5_INCLUDE_DIRS}
   ${PLATFORM_INCLUDES}
 )
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
 )
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${CAS_TKernel}
-  ${CAS_TKMath}
+  ${OpenCASCADE_FoundationClasses_LIBRARIES}
   ${KERNEL_SALOMELocalTrace}
 )
 
@@ -88,11 +87,13 @@ ENDIF(${F2C_FOUND})
 ADD_LIBRARY(MEFISTO2D ${MEFISTO2D_SOURCES})
 TARGET_LINK_LIBRARIES(MEFISTO2D ${_link_LIBRARIES} )
 
-#Ignore MSVCRT.lib on WIN32 in case using f2c code generator
+#Ignore MSVCRT.lib on WINDOWS in case using f2c code generator
 IF(WIN32)
-  IF(${F2C_FOUND})
-    SET_TARGET_PROPERTIES(MEFISTO2D PROPERTIES LINK_FLAGS "/NODEFAULTLIB:MSVCRT")
-  ENDIF(${F2C_FOUND})
+  IF(CMAKE_BUILD_TYPE STREQUAL Debug)
+    IF(${F2C_FOUND})
+      SET_TARGET_PROPERTIES(MEFISTO2D PROPERTIES LINK_FLAGS "/NODEFAULTLIB:MSVCRT")
+    ENDIF(${F2C_FOUND})
+  ENDIF()
 ENDIF(WIN32)
 
 INSTALL(TARGETS MEFISTO2D EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})