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

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

diff --git a/src/Logger/Makefile.am b/src/Logger/Makefile.am
index 94fcc6ae1..6d4849999 100644
--- a/src/Logger/Makefile.am
+++ b/src/Logger/Makefile.am
@@ -30,6 +30,7 @@ SALOME_Logger_Server_LDADD   = libSalomeLoggerServer.la
 SALOME_Logger_Server_CPPFLAGS =\
 	-I$(top_builddir)/salome_adm/unix \
 	-I$(top_builddir)/idl \
+	-I$(srcdir)/../SALOMELocalTrace \
 	@CORBA_CXXFLAGS@ @CORBA_INCLUDES@
 
 # Libraries targets
diff --git a/src/Logger/SALOME_Logger_Server.cxx b/src/Logger/SALOME_Logger_Server.cxx
index af0bd305d..df270fd5a 100644
--- a/src/Logger/SALOME_Logger_Server.cxx
+++ b/src/Logger/SALOME_Logger_Server.cxx
@@ -12,7 +12,7 @@
 #include "SALOME_Logger_Server.hxx"
 #include <SALOMEconfig.h>
 #include <sys/types.h>
-#ifndef __WIN32__
+#ifndef WIN32
 # include <unistd.h>
 #endif
 
diff --git a/src/Logger/SALOME_Logger_Server_main.cxx b/src/Logger/SALOME_Logger_Server_main.cxx
index ba0ed2ee5..e18104592 100644
--- a/src/Logger/SALOME_Logger_Server_main.cxx
+++ b/src/Logger/SALOME_Logger_Server_main.cxx
@@ -12,7 +12,7 @@
 #include "SALOME_Logger_Server.hxx"
 #include <SALOMEconfig.h>
 #include <sys/types.h>
-#ifndef __WIN32__
+#ifndef WIN32
 # include <unistd.h>
 #else
 # include "utilities.h" // for compilation type "timespec"