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 0dd4b57df8a7e1c47949b3440f6eca30d2e54596..b332aa1e60c4f3d3e55abc30153871cedd393c59 100644 (file)
--- 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 5ac93142d0b408c95e7f1b3f6337e76fbc2c59c0..e7e74b19cae6129edc3236173cac771eed9eddd3 100644 (file)
--- 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;