Move log-sink to libs/antares/logs

AntaresSimulatorTeam · Mar 21, 2023 · ae2116a · ae2116a
1 parent 3dd1f1f
commit ae2116a
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 23 deletions.
diff --git a/src/libs/antares/CMakeLists.txt b/src/libs/antares/CMakeLists.txt
@@ -299,6 +299,8 @@ set(SRC_LOGS
 	logs/logs.cpp
 	logs/cleaner.h
 	logs/cleaner.cpp
+    logs/sink.h
+    logs/sink.cpp
 	)
 source_group("misc\\logs" FILES ${SRC_LOGS})
 
@@ -568,5 +570,6 @@ target_link_libraries(libantares-core
 		libantares-core-calendar
 		libantares-solver-variable-info
         result_writer
+        ortools::ortools
 	)
 
diff --git a/src/solver/log-sink/log_sink.cpp → src/libs/antares/logs/sink.cpp b/src/solver/log-sink/log_sink.cpp → src/libs/antares/logs/sink.cpp
@@ -25,9 +25,10 @@
 ** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions
 */
 
+#include "sink.h"
+
 #include <antares/logs.h>
 #include <string_view>
-#include "log_sink.h"
 
 namespace Antares::Solver
 {

diff --git a/src/solver/log-sink/log_sink.h → src/libs/antares/logs/sink.h b/src/solver/log-sink/log_sink.h → src/libs/antares/logs/sink.h
diff --git a/src/solver/CMakeLists.txt b/src/solver/CMakeLists.txt
@@ -18,7 +18,6 @@ add_subdirectory(utils)
 add_subdirectory(optimisation)
 add_subdirectory(main)
 add_subdirectory(constraints-builder)
-add_subdirectory(log-sink)
 #
 # Resource file for Windows
 #
@@ -89,8 +88,7 @@ set(ANTARES_SOLVER_LIBS  ${ANTARES_SOLVER_LIBS}
 	libantares-solver-simulation
 	libantares-solver-ts-generator
 	libmodel_antares
-	libantares-core
-    libantares-log-sink)
+	libantares-core)
 
 target_link_libraries(antares-solver
 		PRIVATE

diff --git a/src/solver/application.h b/src/solver/application.h
@@ -4,7 +4,7 @@
 #include <antares/study.h>
 #include <antares/study/load-options.h>
 #include <antares/benchmarking.h>
-#include <log_sink.h>
+#include <antares/logs/sink.h>
 #include "simulation/simulation.h"
 
 #include <i_writer.h>

diff --git a/src/solver/log-sink/CMakeLists.txt b/src/solver/log-sink/CMakeLists.txt
diff --git a/src/solver/main/CMakeLists.txt b/src/solver/main/CMakeLists.txt
@@ -9,7 +9,7 @@ set(SRC_SOLVER_MAIN_ADEQUACY       adequacy.cpp)
 
 
 add_library(libantares-solver-main-adequacy  ${SRC_SOLVER_MAIN_ADEQUACY})
-target_link_libraries(libantares-solver-main-adequacy PRIVATE libantares-core libantares-log-sink)
+target_link_libraries(libantares-solver-main-adequacy PRIVATE libantares-core)
 
 add_library(libantares-solver-main-economy   ${SRC_SOLVER_MAIN_ECONOMY})
-target_link_libraries(libantares-solver-main-economy PRIVATE libantares-core libantares-log-sink)
+target_link_libraries(libantares-solver-main-economy PRIVATE libantares-core)
diff --git a/src/solver/main/adequacy.cpp b/src/solver/main/adequacy.cpp
@@ -30,6 +30,7 @@
 #include "../simulation/adequacy.h"
 #include <antares/benchmarking.h>
 #include <antares/logs.h>
+#include <antares/logs/sink.h>
 
 namespace Antares
 {

diff --git a/src/solver/main/economy.cpp b/src/solver/main/economy.cpp
@@ -30,6 +30,7 @@
 #include "../simulation/economy.h"
 #include <antares/benchmarking.h>
 #include <antares/logs.h>
+#include <antares/logs/sink.h>
 
 namespace Antares
 {