Skip to content
Snippets Groups Projects
Commit cd448a23 authored by Alexis Girault's avatar Alexis Girault
Browse files

WIP: Correct link issue with g3logger.lib

parent d04e7f35
No related branches found
No related tags found
No related merge requests found
...@@ -5,6 +5,8 @@ include(imstkAddLibrary) ...@@ -5,6 +5,8 @@ include(imstkAddLibrary)
imstk_add_library( Utilities imstk_add_library( Utilities
H_FILES H_FILES
imstkLogUtility.h imstkLogUtility.h
CPP_FILES
imstkLogUtility.cpp
LIBRARIES LIBRARIES
g3log g3log
) )
......
/*=========================================================================
Library: iMSTK
Copyright (c) Kitware, Inc. & Center for Modeling, Simulation,
& Imaging in Medicine, Rensselaer Polytechnic Institute.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0.txt
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
=========================================================================*/
#include "imstkLogUtility.h"
namespace imstk {
stdSink::FG_Color
stdSink::GetColor(const LEVELS level) const
{
if (level.value == WARNING.value) return YELLOW;
if (level.value == DEBUG.value) return GREEN;
if (level.value == FATAL.value) return RED;
return WHITE;
}
void
stdSink::ReceiveLogMessage(g3::LogMessageMover logEntry)
{
auto level = logEntry.get()._level;
auto color = GetColor(level);
std::cout << "\033[" << color << "m"
<< logEntry.get().message()
<< "\033[m" << std::endl;
}
void
LogUtility::createLogger(std::string name, std::string path)
{
m_g3logWorker = g3::LogWorker::createLogWorker();
m_fileSinkHandle = m_g3logWorker->addDefaultLogger(name, path);
m_stdSinkHandle = m_g3logWorker->addSink(
std2::make_unique<stdSink>(), &stdSink::ReceiveLogMessage);
g3::initializeLogging(m_g3logWorker.get());
}
}
\ No newline at end of file
...@@ -34,37 +34,12 @@ struct stdSink { ...@@ -34,37 +34,12 @@ struct stdSink {
// http://stackoverflow.com/questions/2616906/how-do-i-output-coloured-text-to-a-linux-terminal // http://stackoverflow.com/questions/2616906/how-do-i-output-coloured-text-to-a-linux-terminal
enum FG_Color { YELLOW = 33, RED = 31, GREEN = 32, WHITE = 97 }; enum FG_Color { YELLOW = 33, RED = 31, GREEN = 32, WHITE = 97 };
FG_Color GetColor(const LEVELS level) const FG_Color GetColor(const LEVELS level) const;
{ void ReceiveLogMessage(g3::LogMessageMover logEntry);
if (level.value == WARNING.value) return YELLOW;
if (level.value == DEBUG.value) return GREEN;
if (level.value == FATAL.value) return RED;
return WHITE;
}
void ReceiveLogMessage(g3::LogMessageMover logEntry)
{
auto level = logEntry.get()._level;
auto color = GetColor(level);
std::cout << "\033[" << color << "m"
<< logEntry.get().message()
<< "\033[m" << std::endl;
}
}; };
struct LogUtility { struct LogUtility {
void createLogger(std::string name, std::string path) void createLogger(std::string name, std::string path);
{
m_g3logWorker = g3::LogWorker::createLogWorker();
m_fileSinkHandle = m_g3logWorker->addDefaultLogger(name, path);
m_stdSinkHandle = m_g3logWorker->addSink(
std2::make_unique<stdSink>(), &stdSink::ReceiveLogMessage);
g3::initializeLogging(m_g3logWorker.get());
}
std::unique_ptr<g3::LogWorker> m_g3logWorker; std::unique_ptr<g3::LogWorker> m_g3logWorker;
std::unique_ptr<g3::SinkHandle<g3::FileSink> >m_fileSinkHandle; std::unique_ptr<g3::SinkHandle<g3::FileSink> >m_fileSinkHandle;
......
...@@ -24,7 +24,6 @@ function(imstk_add_library target) ...@@ -24,7 +24,6 @@ function(imstk_add_library target)
${target_H_FILES} ${target_H_FILES}
${target_CPP_FILES} ${target_CPP_FILES}
) )
set_target_properties(${target} PROPERTIES LINKER_LANGUAGE CXX)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Link libraries to current target # Link libraries to current target
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#include "imstkCube.h" #include "imstkCube.h"
#include "imstkSimulationManager.h" #include "imstkSimulationManager.h"
#include "g3log/g3log.hpp"
int main() int main()
{ {
std::cout << "****************" << std::endl std::cout << "****************" << std::endl
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment