From a6a772194fe0eac6f4c496adcf5c361331730aff Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 15 Oct 2008 07:35:21 +0000 Subject: [PATCH] Issue 0019981: integrate patch for compilation with cmake (from E.Adam) --- src/Launcher/Launcher.cxx | 7 +------ src/Launcher/Makefile.am | 2 ++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Launcher/Launcher.cxx b/src/Launcher/Launcher.cxx index ed4641f00..71116b922 100644 --- a/src/Launcher/Launcher.cxx +++ b/src/Launcher/Launcher.cxx @@ -28,12 +28,7 @@ #include #include #include - -#ifdef WIN32 -# include -#endif - -using namespace std; +#include //============================================================================= /*! diff --git a/src/Launcher/Makefile.am b/src/Launcher/Makefile.am index 9211ed82d..2883bdf8c 100644 --- 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@ -- 2.39.2