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

diff --git a/src/DF/testDF.cxx b/src/DF/testDF.cxx
index b6148e4b9de16ac635d8a8f620e21c64ecea2a63..05b54ff8485f4b3af263b7d50636e557e51155fa 100644 (file)
--- a/src/DF/testDF.cxx
+++ b/src/DF/testDF.cxx
@@ -21,7 +21,7 @@
 //Author:  Sergey RUIN
 
 #include <stdio.h>
-#include <iostream.h> 
+#include <iostream> 
 #include <vector>
 #include <string>
 
@@ -41,6 +41,7 @@
 #else
 #include <time.h>
 #include <lmcons.h>
+#include <windows.h>
 #endif
 
 using namespace std;
@@ -129,7 +130,7 @@ string GetDirFromPath(const string& thePath) {
   }
   
 #ifdef WIN32  //Check if the only disk letter is given as path
-  if(path.size() == 2 && path[1] == ":") path +='\\';
+  if(path.size() == 2 && path[1] == ':') path +='\\';
 #endif
 
   for(int i = 0, len = path.size(); i<len; i++) 

diff --git a/src/GenericObj/Makefile.am b/src/GenericObj/Makefile.am
index 20cfa0d34f3aa1a6e7f541430130f011ffa7165d..286ffce2eef1c2ec445e1ae620d339d1dd853438 100644 (file)
--- a/src/GenericObj/Makefile.am
+++ b/src/GenericObj/Makefile.am
@@ -25,4 +25,5 @@ libSalomeGenericObj_la_CPPFLAGS = \
        -I$(top_builddir)/idl \
        @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
 libSalomeGenericObj_la_LIBADD  = \
+       ../SALOMELocalTrace/libSALOMELocalTrace.la \
        $(top_builddir)/idl/libSalomeIDLKernel.la

diff --git a/src/HDFPersist/Makefile.am b/src/HDFPersist/Makefile.am
index bb4f64d76f99fc46ebcdaf0c3d1789e597b4fd6e..fe6e58357e60accc07f5149be86b13bf9f541c5b 100644 (file)
--- a/src/HDFPersist/Makefile.am
+++ b/src/HDFPersist/Makefile.am
@@ -90,7 +90,7 @@ libSalomeHDFPersist_la_SOURCES  =\
 
 libSalomeHDFPersist_la_LDFLAGS  = -no-undefined -version-info=0:0:0
 
-libSalomeHDFPersist_la_CPPFLAGS = @HDF5_INCLUDES@ -DPCLINUX \
+libSalomeHDFPersist_la_CPPFLAGS = @HDF5_INCLUDES@ -D@MACHINE@ \
                                   -I$(srcdir)/../SALOMELocalTrace \
                                   -I$(srcdir)/../Basics
 
@@ -112,10 +112,10 @@ EXTRA_DIST = \
 #HDFtest2_SOURCES = test2.c
 #HDFtest3_SOURCES = test3.cxx
 
-#AM_CFLAGS= @CAS_CPPFLAGS@ @HDF5_INCLUDES@ -DPCLINUX \
+#AM_CFLAGS= @CAS_CPPFLAGS@ @HDF5_INCLUDES@ -D@MACHINE@ \
 #                                  -I$(srcdir)/../SALOMELocalTrace \
 #                                  -I$(srcdir)/../Basics
-#AM_CXXFLAGS= @CAS_CPPFLAGS@ @HDF5_INCLUDES@ -DPCLINUX \
+#AM_CXXFLAGS= @CAS_CPPFLAGS@ @HDF5_INCLUDES@ -D@MACHINE@ \
 #                                  -I$(srcdir)/../SALOMELocalTrace \
 #                                  -I$(srcdir)/../Basics
 #AM_LDFLAGS= @HDF5_LIBS@