From: vsr <vsr@opencascade.com>
Date: Wed, 15 Oct 2008 09:56:18 +0000 (+0000)
Subject: Issue 0019981: integrate patch for compilation with cmake (from E.Adam)
X-Git-Tag: V5_1_0a3~13
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=20a474fad1c36437bfd8d14694f53376ece2692c;p=modules%2Fkernel.git

Issue 0019981: integrate patch for compilation with cmake (from E.Adam)
---

diff --git a/src/NOTIFICATION_SWIG/Makefile.am b/src/NOTIFICATION_SWIG/Makefile.am
index 0dd4b57df..b332aa1e6 100644
--- a/src/NOTIFICATION_SWIG/Makefile.am
+++ b/src/NOTIFICATION_SWIG/Makefile.am
@@ -55,7 +55,7 @@ _libNOTIFICATION_la_CPPFLAGS =\
 
 
 _libNOTIFICATION_la_LDFLAGS  = -module
-_libNOTIFICATION_la_LIBADD   = ../Notification/libSalomeNotification.la
+_libNOTIFICATION_la_LIBADD   = @PYTHON_LIBS@ ../Notification/libSalomeNotification.la
 
 swig_wrap.cpp : $(SWIG_SOURCES)
 	$(SWIG) $(SWIG_FLAGS) -o $@ $<
diff --git a/src/ResourcesManager/ResourcesManager.cxx b/src/ResourcesManager/ResourcesManager.cxx
index 5ac93142d..e7e74b19c 100644
--- a/src/ResourcesManager/ResourcesManager.cxx
+++ b/src/ResourcesManager/ResourcesManager.cxx
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <map>
 #include <list>
+#include <algorithm>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -32,8 +33,6 @@
 
 #ifndef WIN32
 # include <unistd.h>
-#else
-# include <algorithm>
 #endif
 
 #define MAX_SIZE_FOR_HOSTNAME 256;