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

diff --git a/src/Launcher/Launcher.cxx b/src/Launcher/Launcher.cxx
index ed4641f0094684d40c25e3aea4b6e85bdd71c43f..71116b9226f5f5bd545920d6e5bc2283e8e02e8e 100644 (file)
--- a/src/Launcher/Launcher.cxx
+++ b/src/Launcher/Launcher.cxx
@@ -28,12 +28,7 @@
 #include <iostream>
 #include <sstream>
 #include <sys/stat.h>
-
-#ifdef WIN32
-# include <time.h>
-#endif
-
-using namespace std;
+#include <time.h>
 
 //=============================================================================
 /*! 

diff --git a/src/Launcher/Makefile.am b/src/Launcher/Makefile.am
index 9211ed82df3c012ae6ad0720def25eacb40a9122..2883bdf8c54ada3dbad9387504c5be8753463370 100644 (file)
--- a/src/Launcher/Makefile.am
+++ b/src/Launcher/Makefile.am
@@ -122,6 +122,8 @@ libLauncher_la_LDFLAGS  =\
        @LDEXPDYNFLAGS@
 
 libLauncher_la_LIBADD =\
+       ../Batch/libSalomeBatch.la \
+       ../ResourcesManager/libResourcesManager.la \
        @MPI_LIBS@ \
        @LIBXML_LIBS@