From: adam <adam>
Date: Thu, 22 Jan 2009 14:01:21 +0000 (+0000)
Subject: compatibility with C.Caremoli commits in Makefile.am's
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ac760b49de96ee173cafedfa6cbdadcc7faa0362;p=modules%2Fkernel.git

compatibility with C.Caremoli commits in Makefile.am's
---

diff --git a/salome_adm/cmake_files/am2cmake.py b/salome_adm/cmake_files/am2cmake.py
index 6f75f16b0..ce51cc9e8 100644
--- a/salome_adm/cmake_files/am2cmake.py
+++ b/salome_adm/cmake_files/am2cmake.py
@@ -699,11 +699,13 @@ class CMakeFile(object):
         
         # --
         # --
-        if self.__thedict__.has_key("SWIG_SRC"):
-            newlines.append('''
-            SET(SWIG_SOURCES ${SWIG_SRC})
-            ''')
-            self.__thedict__["SWIG_SOURCES"] = self.__thedict__["SWIG_SRC"]
+        for key in ["SWIG_SRC", "SWIGSOURCES"]:
+            if self.__thedict__.has_key(key):
+                newlines.append('''
+                SET(SWIG_SOURCES ${%s})
+                '''%(key))
+                self.__thedict__["SWIG_SOURCES"] = self.__thedict__[key]
+                pass
             pass
         
         # --
@@ -992,7 +994,11 @@ class CMakeFile(object):
         ENDFOREACH(src ${${amname}_SOURCES} ${dist_${amname}_SOURCES})
         SET(build_srcs)
         FOREACH(f ${nodist_${amname}_SOURCES} ${BUILT_SOURCES})
+        GET_FILENAME_COMPONENT(ext ${f} EXT)
+        IF(ext STREQUAL .py)
+        ELSE(ext STREQUAL .py)
         SET(build_srcs ${build_srcs} ${CMAKE_CURRENT_BINARY_DIR}/${f})
+        ENDIF(ext STREQUAL .py)
         ENDFOREACH(f ${nodist_${amname}_SOURCES})
         SET(srcs ${build_srcs} ${srcs})
         ''')