From: adam <adam>
Date: Tue, 8 Sep 2009 08:41:04 +0000 (+0000)
Subject: Update according new version of
X-Git-Tag: V5_1_3rc1~75
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=aeff0fe4ce2b1014bec4cfecdd8326a4778d1b88;p=modules%2Fkernel.git

Update according new version of
make_common_starter.am in which is defined
AM_CXXFLAGS = -I$(top_builddir)/salome_adm/unix -include SALOMEconfig.h
AM_CPPFLAGS = -I$(top_builddir)/salome_adm/unix -include SALOMEconfig.h
---

diff --git a/salome_adm/cmake_files/am2cmake.py b/salome_adm/cmake_files/am2cmake.py
index 0224588a4..692434ad1 100644
--- a/salome_adm/cmake_files/am2cmake.py
+++ b/salome_adm/cmake_files/am2cmake.py
@@ -612,6 +612,10 @@ class CMakeFile(object):
         SET(AM_CXXFLAGS)
         SET(LDADD)
         """)
+        newlines.append(r'''
+        SET(AM_CPPFLAGS ${AM_CPPFLAGS} -DHAVE_SALOME_CONFIG -I${CMAKE_BINARY_DIR}/salome_adm/unix -include SALOMEconfig.h)
+        SET(AM_CXXFLAGS ${AM_CXXFLAGS} -DHAVE_SALOME_CONFIG -I${CMAKE_BINARY_DIR}/salome_adm/unix -include SALOMEconfig.h)
+        ''')
         # --
         return
     
@@ -1197,12 +1201,10 @@ class CMakeFile(object):
             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} ${AM_CPPFLAGS})
+        SET(var ${var} ${AM_CXXFLAGS})
+        ''')
         newlines.append(r'''
 	SET(var ${var} ${PLATFORM_CPPFLAGS})
 	SET(var ${var} ${PTHREAD_CFLAGS})