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

diff --git a/src/Logger/Makefile.am b/src/Logger/Makefile.am
index 94fcc6ae109b9f67993449494737bf5a1e9b9953..6d48499992cf5f08cc558f9739e29f42516fd3e4 100644 (file)
--- 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 af0bd305da0b5d94200f77ed9ea1c94e7cd952d0..df270fd5a033efb0e9d53118a4457429796b2118 100644 (file)
--- 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 ba0ed2ee5fcfd4415c786337bc872c278fe2e49f..e18104592964aab61da3a057e8937ae7dcb1f692 100644 (file)
--- 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"