Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 00:31:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

FairMQLogger : remove pragma command and use CMake include SYSTEM command instead

Browse Source
This commit is contained in:
NicolasWinckler 2015-11-24 12:06:07 +01:00 committed by Florian Uhlig
parent 2afa0652f4
commit 2060f0b1d7
2 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fairmq/logger/CMakeLists.txt
View File

@ -13,7 +13,9 @@ set(INCLUDE_DIRECTORIES
) )
include_directories(${INCLUDE_DIRECTORIES}) include_directories(${INCLUDE_DIRECTORIES})
include_directories(${Boost_INCLUDE_DIRS})
set(SYSTEM_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR})
include_Directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
set(LINK_DIRECTORIES ${Boost_LIBRARY_DIRS}) set(LINK_DIRECTORIES ${Boost_LIBRARY_DIRS})

35
fairmq/logger/logger.h
View File

@ -22,20 +22,12 @@
#include <cstddef> #include <cstddef>
#include <iostream> #include <iostream>
// boost
#include <boost/version.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/date_time/posix_time/posix_time_io.hpp>
#include <boost/log/sources/global_logger_storage.hpp> #include <boost/log/sources/global_logger_storage.hpp>
#include <boost/log/expressions/attr_fwd.hpp> #include <boost/log/expressions/attr_fwd.hpp>
#include <boost/version.hpp>
// WARNING : pragma commands to hide boost Wshadow warning
#if defined(__clang__)
_Pragma("clang diagnostic push")
_Pragma("clang diagnostic ignored \"-Wshadow\"")
// boost
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/date_time/posix_time/posix_time_io.hpp>
#include <boost/log/sources/severity_logger.hpp> #include <boost/log/sources/severity_logger.hpp>
#include <boost/log/utility/formatting_ostream.hpp> #include <boost/log/utility/formatting_ostream.hpp>
#include <boost/log/expressions.hpp> #include <boost/log/expressions.hpp>
@ -43,26 +35,9 @@
#include <boost/log/utility/formatting_ostream.hpp> #include <boost/log/utility/formatting_ostream.hpp>
#include <boost/log/sinks/text_file_backend.hpp> #include <boost/log/sinks/text_file_backend.hpp>
#include <boost/log/sinks/sync_frontend.hpp> #include <boost/log/sinks/sync_frontend.hpp>
// fairmq // fairmq
#include "logger_def.h" #include "logger_def.h"
_Pragma("clang diagnostic pop")
#elif defined(__GNUC__) || defined(__GNUG__)
_Pragma("GCC diagnostic push")
_Pragma("GCC diagnostic ignored \"-Wshadow\"")
// boost
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/date_time/posix_time/posix_time_io.hpp>
#include <boost/log/sources/severity_logger.hpp>
#include <boost/log/utility/formatting_ostream.hpp>
#include <boost/log/expressions.hpp>
#include <boost/log/expressions/attr.hpp>
#include <boost/log/utility/formatting_ostream.hpp>
#include <boost/log/sinks/text_file_backend.hpp>
#include <boost/log/sinks/sync_frontend.hpp>
// fairmq
#include "logger_def.h"
_Pragma("GCC diagnostic pop")
#endif