Remove deps to core (#1586)

* Fix merge * Fix compil * Fix compil * Reestablish -j2 build option as it doesn't change anything removing it * Remove commented code * Use proper casing for s(S)ettings struct * Remove duplicated link dependency * add missing dependency in writer
AntaresSimulatorTeam · Sep 12, 2023 · 40e4383 · 40e4383
1 parent 28e1e5d
commit 40e4383
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 20 deletions.
diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml
@@ -118,7 +118,7 @@ jobs:
     - name: Build
       shell: bash
       run: |
-           cmake --build _build --config release
+           cmake --build _build --config release -j2
 
     - name: Run unfeasibility-related tests
       run: |

diff --git a/src/libs/antares/checks/CMakeLists.txt b/src/libs/antares/checks/CMakeLists.txt
@@ -10,16 +10,6 @@ add_library(checks
 add_library(Antares::checks ALIAS checks)
 
 target_include_directories(checks
-        PRIVATE
-#        ${CMAKE_SOURCE_DIR}/libs/
-#        ${CMAKE_SOURCE_DIR}/libs/antares/study
-#        ${CMAKE_SOURCE_DIR}/libs/antares/inifile #adq-patch-params
-#        ${CMAKE_SOURCE_DIR}/libs/antares/array #area
-#        ${CMAKE_SOURCE_DIR}/libs/antares/io #area -> matrix -> io
-#        ${CMAKE_SOURCE_DIR}/libs/antares/date #area -> parameter -> date
-#        ${CMAKE_SOURCE_DIR}/libs/antares/writer #area -> antares/parts/thermal/cluster -> writer
-#        ${CMAKE_SOURCE_DIR}/libs/antares/jit #area -> matrix -> jit
-#        ${CMAKE_SOURCE_DIR}/libs/antares/memory/include #area -> matrix -> memory
         PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}
 )

diff --git a/src/libs/antares/date/antares/date/date.h b/src/libs/antares/date/antares/date/date.h
@@ -292,7 +292,7 @@ class Calendar
     } mapping;
 
     //! The calendar settings
-    struct settings
+    struct Settings
     {
         //! Day of the week for the 1rst January
         DayOfTheWeek weekday1rstJanuary;
@@ -355,7 +355,7 @@ class Calendar
     ** Reset the calendar from an instance of the class \p Parameters,
     ** \param parameters Simulation settings
     */
-    void reset(settings settings);
+    void reset(Settings settings);
 
     /*!
     ** \brief Export the whole calendar into a CSV file
@@ -365,7 +365,7 @@ class Calendar
     bool saveToCSVFile(const AnyString& filename) const;
 
 private:
-    settings settings_;
+    Settings settings_;
 
 }; // class Calendar
 } // namespace Date

diff --git a/src/libs/antares/date/date.cpp b/src/libs/antares/date/date.cpp
@@ -402,7 +402,7 @@ Calendar::Calendar()
     settings_.weekday1rstJanuary = monday;
 }
 
-void Calendar::reset(settings settings)
+void Calendar::reset(Settings settings)
 {
     settings_ = settings;
     reset();

diff --git a/src/libs/antares/study/CMakeLists.txt b/src/libs/antares/study/CMakeLists.txt
@@ -425,6 +425,7 @@ add_library(Antares::study ALIAS study)
 
 target_link_libraries(study
     PUBLIC
+        Boost::boost
         yuni-static-core
         Boost::boost
         Antares::array #xcast
@@ -439,9 +440,11 @@ target_link_libraries(study
         Antares::object
     PRIVATE
         Antares::exception
+        Antares::benchmarking
 )
 
 target_include_directories(study
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}/../..
+     PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/../.. #Dirty trick to allow inclusion via <antares/study/X>
+        # Make more than just study visible but it's the lesser evil for now
 )
diff --git a/src/libs/antares/writer/CMakeLists.txt b/src/libs/antares/writer/CMakeLists.txt
@@ -33,7 +33,6 @@ target_link_libraries(result_writer
         PUBLIC
         Antares::benchmarking
         PRIVATE
-        Antares::benchmarking
         yuni-static-core
         MINIZIP::minizip
         logs

diff --git a/src/libs/antares/writer/antares/writer/writer_factory.h b/src/libs/antares/writer/antares/writer/writer_factory.h
@@ -5,7 +5,10 @@
 
 #include "i_writer.h"
 #include "result_format.h"
-#include <antares/benchmarking/DurationCollector.h>
+
+namespace Benchmarking {
+    class IDurationCollector;
+}
 
 namespace Antares::Solver
 {

diff --git a/src/solver/optimisation/CMakeLists.txt b/src/solver/optimisation/CMakeLists.txt
@@ -92,4 +92,6 @@ target_link_libraries(libmodel_antares
 		utils
 		sirius_solver
 		infeasible_problem_analysis
-		libantares-solver-simulation)
+		libantares-solver-simulation
+		Antares::benchmarking
+)