From 02d315af2924e00cfdba09e052b61e84c2df2fa2 Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@cnes.fr>
Date: Wed, 21 Feb 2018 09:22:46 +0100
Subject: [PATCH] REFAC: Moving otb::Logger to Core/Common
---
.../ApplicationEngine => Core/Common}/include/otbLogger.h | 0
Modules/Core/Common/src/CMakeLists.txt | 1 +
.../ApplicationEngine => Core/Common}/src/otbLogger.cxx | 0
Modules/Wrappers/ApplicationEngine/src/CMakeLists.txt | 3 ++-
4 files changed, 3 insertions(+), 1 deletion(-)
rename Modules/{Wrappers/ApplicationEngine => Core/Common}/include/otbLogger.h (100%)
rename Modules/{Wrappers/ApplicationEngine => Core/Common}/src/otbLogger.cxx (100%)
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbLogger.h b/Modules/Core/Common/include/otbLogger.h
similarity index 100%
rename from Modules/Wrappers/ApplicationEngine/include/otbLogger.h
rename to Modules/Core/Common/include/otbLogger.h
diff --git a/Modules/Core/Common/src/CMakeLists.txt b/Modules/Core/Common/src/CMakeLists.txt
index 02ff6250e7..50e410e9c8 100644
--- a/Modules/Core/Common/src/CMakeLists.txt
+++ b/Modules/Core/Common/src/CMakeLists.txt
@@ -29,6 +29,7 @@ set(OTBCommon_SRC
otbWriterWatcherBase.cxx
otbStopwatch.cxx
otbStringToHTML.cxx
+ otbLogger.cxx
)
add_library(OTBCommon ${OTBCommon_SRC})
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbLogger.cxx b/Modules/Core/Common/src/otbLogger.cxx
similarity index 100%
rename from Modules/Wrappers/ApplicationEngine/src/otbLogger.cxx
rename to Modules/Core/Common/src/otbLogger.cxx
diff --git a/Modules/Wrappers/ApplicationEngine/src/CMakeLists.txt b/Modules/Wrappers/ApplicationEngine/src/CMakeLists.txt
index db3f434b5f..9107d2961e 100644
--- a/Modules/Wrappers/ApplicationEngine/src/CMakeLists.txt
+++ b/Modules/Wrappers/ApplicationEngine/src/CMakeLists.txt
@@ -56,9 +56,10 @@ set( OTBApplicationEngine_SRC
otbWrapperStringListParameter.cxx
otbWrapperAbstractParameterList.cxx
otbWrapperParameterList.cxx
- otbLogger.cxx
)
+message("Common libraries: ${OTBCommon_LIBRARIES}")
+
add_library(OTBApplicationEngine ${OTBApplicationEngine_SRC})
target_link_libraries(OTBApplicationEngine
${OTBVectorDataBase_LIBRARIES}
--
GitLab