Fix KERNEL compilation problem in light mode (without CORBA) if cppunit package is...

diff --git a/src/Makefile.am b/src/Makefile.am
index 2a46496ef90c77bde874a5154dc00209f391f959..9916eee5604e10d030a62e98668804f6d20d0d33 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -110,6 +110,8 @@ endif
 
 if CPPUNIT_IS_OK
   SUBDIRS += $(SUBDIR_CPPUNIT_BASE)
+if CORBA_GEN
   SUBDIRS += $(SUBDIR_CPPUNIT_CORBA)
+endif
   SUBDIRS += $(SUBDIR_CPPUNIT_GENERAL)
 endif

diff --git a/src/UnitTests/Makefile.am b/src/UnitTests/Makefile.am
index 47ed6159638dd06651dddf6bea154434cf872baa..b55f3b89d4e4686dda7646827cacdb74bc46ad00 100644 (file)
--- a/src/UnitTests/Makefile.am
+++ b/src/UnitTests/Makefile.am
@@ -49,24 +49,31 @@ UnitTests_CPPFLAGS =\
        @CPPUNIT_INCLUDES@ \
        -I$(srcdir)/../Basics -I$(srcdir)/../Basics/Test \
        -I$(srcdir)/../SALOMELocalTrace -I$(srcdir)/../SALOMELocalTrace/Test \
+       -I$(top_builddir)/salome_adm/unix
+
+if CORBA_GEN
+  UnitTests_CPPFLAGS +=\
+       -DWITH_CORBA \
        -I$(srcdir)/../SALOMETraceCollector -I$(srcdir)/../SALOMETraceCollector/Test \
        -I$(srcdir)/../NamingService -I$(srcdir)/../NamingService/Test \
        -I$(srcdir)/../Utils -I$(srcdir)/../Utils/Test \
-       -I$(srcdir)/../Registry \
-       -I$(srcdir)/../Notification \
-       -I$(srcdir)/../ResourcesManager \
        -I$(srcdir)/../LifeCycleCORBA -I$(srcdir)/../LifeCycleCORBA/Test \
        -I$(srcdir)/../SALOMDESImpl -I$(srcdir)/../SALOMEDSImpl/Test \
        -I$(srcdir)/../SALOMDES -I$(srcdir)/../SALOMEDS/Test \
-       -I$(top_builddir)/salome_adm/unix \
        -I$(top_builddir)/idl \
+       -I$(srcdir)/../Registry \
+       -I$(srcdir)/../Notification \
+       -I$(srcdir)/../ResourcesManager \
        @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
-
+endif
 
 UnitTests_LDADD    =\
        @CPPUNIT_LIBS@ \
        ../Basics/libSALOMEBasics.la \
-       ../SALOMELocalTrace/libSALOMELocalTrace.la ../SALOMELocalTrace/Test/libSALOMELocalTraceTest.la \
+       ../SALOMELocalTrace/libSALOMELocalTrace.la ../SALOMELocalTrace/Test/libSALOMELocalTraceTest.la
+
+if CORBA_GEN
+  UnitTests_LDADD    +=\
        ../Registry/libRegistry.la \
        ../Notification/libSalomeNotification.la \
        ../ResourcesManager/libSalomeResourcesManager.la \
@@ -79,5 +86,4 @@ UnitTests_LDADD    =\
        ../SALOMEDS/libSalomeDS.la ../SALOMEDS/Test/libSALOMEDSTest.la \
        $(top_builddir)/idl/libSalomeIDLKernel.la\
        @CORBA_LIBS@
-
-
+endif

diff --git a/src/UnitTests/UnitTests.cxx b/src/UnitTests/UnitTests.cxx
index ef7006a868c936014c8bad8b511822bda3e055ad..ed5ea9b5d00c353497dddc8a21e4cda2060efb7f 100644 (file)
--- a/src/UnitTests/UnitTests.cxx
+++ b/src/UnitTests/UnitTests.cxx
@@ -21,22 +21,27 @@
 // --- include all Unit Test from basics until the present directory
 
 #include "SALOMELocalTraceTest.hxx"
+
+#ifdef WITH_CORBA
 #include "SALOMETraceCollectorTest.hxx"
 #include "UtilsTest.hxx"
 #include "NamingServiceTest.hxx"
 #include "LifeCycleCORBATest.hxx"
 #include "SALOMEDSImplTest.hxx"
 #include "SALOMEDSTest.hxx"
+#endif
 
 // --- Registers the fixture into the 'registry'
 
 CPPUNIT_TEST_SUITE_REGISTRATION( SALOMELocalTraceTest );
+#ifdef WITH_CORBA
 CPPUNIT_TEST_SUITE_REGISTRATION( SALOMETraceCollectorTest );
 CPPUNIT_TEST_SUITE_REGISTRATION( UtilsTest );
 CPPUNIT_TEST_SUITE_REGISTRATION( NamingServiceTest );
 CPPUNIT_TEST_SUITE_REGISTRATION( LifeCycleCORBATest );
 CPPUNIT_TEST_SUITE_REGISTRATION( SALOMEDSImplTest );
-CPPUNIT_TEST_SUITE_REGISTRATION(SALOMEDSTest );
+CPPUNIT_TEST_SUITE_REGISTRATION( SALOMEDSTest );
+#endif
 
 // --- generic Main program from Basic/Test