From ef632355cca7c54da9f53f52e8782de3791b610e Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 26 Jan 2009 11:00:25 +0000 Subject: [PATCH] compatibility medmem (continue) --- salome_adm/cmake_files/am2cmake.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/salome_adm/cmake_files/am2cmake.py b/salome_adm/cmake_files/am2cmake.py index fb0708bb8..36e6d035a 100644 --- 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}) -- 2.39.2