From 813f259b149f8cd56fff458a6474d1727da02218 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 15 Oct 2008 09:26:25 +0000 Subject: [PATCH] Issue 0019981: integrate patch for compilation with cmake (from E.Adam) --- src/Logger/Makefile.am | 1 + src/Logger/SALOME_Logger_Server.cxx | 2 +- src/Logger/SALOME_Logger_Server_main.cxx | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) 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 #include -#ifndef __WIN32__ +#ifndef WIN32 # include #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 #include -#ifndef __WIN32__ +#ifndef WIN32 # include #else # include "utilities.h" // for compilation type "timespec" -- 2.39.2