From ff453adf350f256312601bfde8a189668964f5c0 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 16 Jan 2009 17:24:47 +0000 Subject: [PATCH] compatibility medfile (continue) --- salome_adm/cmake_files/am2cmake.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/salome_adm/cmake_files/am2cmake.py b/salome_adm/cmake_files/am2cmake.py index ae85fe8ba..439fa0c54 100644 --- a/salome_adm/cmake_files/am2cmake.py +++ b/salome_adm/cmake_files/am2cmake.py @@ -434,9 +434,9 @@ class CMakeFile(object): pass # -- - # If the line begins with 'include', just comment it + # If the line begins with 'include ', just comment it # -- - if line.find("include") == 0: + if line.find("include ") == 0: newlines.append("# " + line) return @@ -824,6 +824,12 @@ class CMakeFile(object): "nodist_salomepython_PYTHON" : "lib/python${PYTHON_VERSION}/site-packages/salome", "sharedpkgpython_PYTHON" : "lib/python${PYTHON_VERSION}/site-packages/salome/shared_modules", } + if self.module == "medfile": + d = { + "include_HEADERS" : "include", + "nodist_include_HEADERS" : "include", + } + pass for key, value in d.items(): if self.__thedict__.has_key(key): self.addInstallTarget(key, value, newlines) @@ -1022,11 +1028,11 @@ class CMakeFile(object): self.setLibAdd(newlines) # -- newlines.append(r''' - IF(name STREQUAL SalomeHDFPersist) IF(WINDOWS) + IF(name STREQUAL SalomeHDFPersist) SET_TARGET_PROPERTIES(${name} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMTD") - ENDIF(WINDOWS) ENDIF(name STREQUAL SalomeHDFPersist) + ENDIF(WINDOWS) ''') # -- if key != "noinst_LTLIBRARIES": -- 2.39.2