diff --git a/src/libs/antares/CMakeLists.txt b/src/libs/antares/CMakeLists.txt index 9ade57269c..bf2138eefc 100644 --- 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 b/src/libs/antares/logs/sink.cpp similarity index 99% rename from src/solver/log-sink/log_sink.cpp rename to src/libs/antares/logs/sink.cpp index 61bd88fd55..04eecdb682 100644 --- a/src/solver/log-sink/log_sink.cpp +++ b/src/libs/antares/logs/sink.cpp @@ -25,9 +25,10 @@ ** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions */ +#include "sink.h" + #include #include -#include "log_sink.h" namespace Antares::Solver { diff --git a/src/solver/log-sink/log_sink.h b/src/libs/antares/logs/sink.h similarity index 100% rename from src/solver/log-sink/log_sink.h rename to src/libs/antares/logs/sink.h diff --git a/src/solver/CMakeLists.txt b/src/solver/CMakeLists.txt index c90c7dd04d..00c6def076 100644 --- 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 index 15be43f995..894779b3ce 100644 --- a/src/solver/application.h +++ b/src/solver/application.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include "simulation/simulation.h" #include diff --git a/src/solver/log-sink/CMakeLists.txt b/src/solver/log-sink/CMakeLists.txt deleted file mode 100644 index 15141b46c9..0000000000 --- a/src/solver/log-sink/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -set(ANTARES_LOG_SINK_SRC - log_sink.h - log_sink.cpp) - -source_group("log-sink" FILES ${ANTARES_LOG_SINK_SRC}) - -add_library(libantares-log-sink ${ANTARES_LOG_SINK_SRC}) - -target_include_directories(libantares-log-sink PUBLIC - ${CMAKE_SOURCE_DIR}/solver/log-sink) - -target_link_libraries(libantares-log-sink - PRIVATE - libantares-core - PUBLIC - ortools::ortools) diff --git a/src/solver/main/CMakeLists.txt b/src/solver/main/CMakeLists.txt index fc4fe7ddd6..68e2c804b5 100644 --- 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 index e95df01402..dcfbbe211e 100644 --- a/src/solver/main/adequacy.cpp +++ b/src/solver/main/adequacy.cpp @@ -30,6 +30,7 @@ #include "../simulation/adequacy.h" #include #include +#include namespace Antares { diff --git a/src/solver/main/economy.cpp b/src/solver/main/economy.cpp index aac780a402..054d33e23e 100644 --- a/src/solver/main/economy.cpp +++ b/src/solver/main/economy.cpp @@ -30,6 +30,7 @@ #include "../simulation/economy.h" #include #include +#include namespace Antares {