Changeset 10700 for source/ariba/utility/system

Timestamp:

Aug 22, 2012, 2:09:00 PM (12 years ago)

Author:

Michael Tänzer

Message:

Merge CMake branch into trunk

Location:

source

Files:

• . (modified) (1 prop)
• ariba (modified) (1 prop)
• ariba/utility (modified) (1 prop)
• ariba/utility/system (modified) (1 prop)
• ariba/utility/system/CMakeLists.txt (added)
• ariba/utility/system/StartupWrapper.cpp (modified) (2 diffs)

source/ariba/utility/system/StartupWrapper.cpp

@@ -40 +40 @@
 #include "ariba/config.h"
 
-#ifdef HAVE_LOG4CXX_LOGGER_H
+#ifdef HAVE_LOG4CXX
         #include <log4cxx/logger.h>
         #include <log4cxx/basicconfigurator.h>
-#endif // HAVE_LOG4CXX_LOGGER_H
+#endif // HAVE_LOG4CXX
 
 namespace ariba {
@@ -97 +97 @@
         //
 
-#ifdef HAVE_LOG4CXX_LOGGER_H
+#ifdef HAVE_LOG4CXX
         log4cxx::BasicConfigurator::configure();
-#endif //HAVE_LOG4CXX_LOGGER_H
+#endif //HAVE_LOG4CXX
 
         //