compatibility medmem (continue)

diff --git a/salome_adm/cmake_files/am2cmake.py b/salome_adm/cmake_files/am2cmake.py
index fb0708bb8f756ad6d58599e07e9280510cf99d1f..36e6d035a8925f4d50cbcad9a337e537a35bdf7c 100644 (file)
--- a/salome_adm/cmake_files/am2cmake.py
+++ b/salome_adm/cmake_files/am2cmake.py
@@ -881,6 +881,14 @@ class CMakeFile(object):
         # --
         newlines.append(r'''
         SET(libs ${${amname}_LIBADD} ${${amname}_LDADD} ${${amname}_LDFLAGS})
+        ''')
+        if key == "bin_PROGRAMS":
+            newlines.append(r'''
+            SET(libs ${libs} ${LDADD})
+            ''')
+            pass
+        # --
+        newlines.append(r'''
         FOREACH(lib ${libs})
         GET_FILENAME_COMPONENT(ext ${lib} EXT)
         IF(ext STREQUAL .la)
@@ -938,12 +946,18 @@ class CMakeFile(object):
         ENDIF(name STREQUAL GEOMEngine)
         ENDIF(WINDOWS)
         ''')
-        if self.module in ["geom"]:
+        if self.module in ["geom", "med"]:
             newlines.append(r'''
             SET(var ${var} -I${CMAKE_CURRENT_SOURCE_DIR})
             SET(var ${var} -I${CMAKE_CURRENT_BINARY_DIR})
             ''')
             pass
+        if key == "bin_PROGRAMS":
+            newlines.append(r'''
+            SET(var ${var} ${AM_CPPFLAGS})
+            SET(var ${var} ${AM_CXXFLAGS})
+            ''')
+            pass
         newlines.append(r'''
        SET(var ${var} ${PLATFORM_CPPFLAGS})
        SET(var ${var} ${PTHREADS_INCLUDES})