From: adam <adam>
Date: Mon, 9 Mar 2009 09:05:56 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: V5_1_1rc2~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f81a671c8a613869d49e4a8d2ad37eec0b3d9f97;p=modules%2Fkernel.git

*** empty log message ***
---

diff --git a/salome_adm/cmake_files/FindPLATFORM.cmake b/salome_adm/cmake_files/FindPLATFORM.cmake
index 7002c2a1e..a753fb63a 100644
--- a/salome_adm/cmake_files/FindPLATFORM.cmake
+++ b/salome_adm/cmake_files/FindPLATFORM.cmake
@@ -63,10 +63,10 @@ IF(WINDOWS)
   SET(PLATFORM_CPPFLAGS ${PLATFORM_CPPFLAGS} -DWNT)
   SET(PLATFORM_CPPFLAGS ${PLATFORM_CPPFLAGS} -DPPRO_NT) # For medfile
   SET(PLATFORM_CPPFLAGS ${PLATFORM_CPPFLAGS} -D_USE_MATH_DEFINES) # At least for MEDMEM
-  SET(PLATFORM_LIBADD Ws2_32.lib)
-  SET(PLATFORM_LIBADD Userenv.lib) # At least for GEOM suit
+  SET(PLATFORM_LIBADD ${PLATFORM_LIBADD} Ws2_32.lib)
+  SET(PLATFORM_LIBADD ${PLATFORM_LIBADD} Userenv.lib) # At least for GEOM suit
 ELSE(WINDOWS)
-  SET(PLATFORM_LIBADD -ldl)
+  SET(PLATFORM_LIBADD ${PLATFORM_LIBADD} -ldl)
 ENDIF(WINDOWS)
 
 #  SET(PLATFORM_CPPFLAGS)
diff --git a/salome_adm/cmake_files/am2cmake.py b/salome_adm/cmake_files/am2cmake.py
index 8f6ef65a0..01748db72 100644
--- a/salome_adm/cmake_files/am2cmake.py
+++ b/salome_adm/cmake_files/am2cmake.py
@@ -1057,6 +1057,9 @@ class CMakeFile(object):
         # --
         newlines.append(r'''
         SET(libs ${PLATFORM_LIBADD} ${PLATFORM_LDFLAGS} ${${amname}_LIBADD} ${${amname}_LDADD} ${${amname}_LDFLAGS})
+        IF(name STREQUAL SALOMEBasics)
+        SET(libs ${libs} ${PTHREAD_LIBS})
+        ENDIF(name STREQUAL SALOMEBasics)
         ''')
         if key == "bin_PROGRAMS":
             newlines.append(r'''
@@ -1088,11 +1091,7 @@ class CMakeFile(object):
         ENDFOREACH(v ${vars})
         SET(libadd ${libadd} ${lib})
         ENDFOREACH(lib ${libs})
-        IF(name STREQUAL SALOMEBasics)
-        TARGET_LINK_LIBRARIES(${name} ${PTHREAD_LIBS} ${libadd})
-        ELSE(name STREQUAL SALOMEBasics)
         TARGET_LINK_LIBRARIES(${name} ${libadd})
-        ENDIF(name STREQUAL SALOMEBasics)
         ''')
         # --
         return
@@ -1154,6 +1153,7 @@ class CMakeFile(object):
         SET(vars)
         IF(WINDOWS)
         SET(vars ${vars} -include SALOMEconfig.h)
+        SET(vars ${vars} -ftemplate-depth-32)
         ENDIF(WINDOWS)
         SET(flags)
         FOREACH(f ${var})