Merge remote-tracking branch 'origin/feature/study' into feature/study

AntaresSimulatorTeam · Sep 12, 2023 · 6ecf2fc · 6ecf2fc
2 parents 015599d + 28e1e5d
commit 6ecf2fc
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 5 deletions.
diff --git a/src/libs/antares/logs/CMakeLists.txt b/src/libs/antares/logs/CMakeLists.txt
@@ -17,10 +17,14 @@ source_group("misc\\logs" FILES ${SRC_LOGS})
 add_library(${PROJ} ${SRC_LOGS})
 add_library(Antares::${PROJ} ALIAS ${PROJ})
 
+if(WIN32)
+        find_library(WSOCK32_LIBRARY wsock32)
+        find_library(WS2_32_LIBRARY ws2_32)
+        target_link_libraries(${PROJ} PUBLIC wsock32 ws2_32)
+endif()
 target_link_libraries(${PROJ}
-        PRIVATE
+        PUBLIC
         yuni-static-core
-        Antares::sys
         )
 
 target_include_directories(${PROJ}

diff --git a/src/solver/simulation/CMakeLists.txt b/src/solver/simulation/CMakeLists.txt
@@ -58,4 +58,8 @@ target_include_directories(libantares-solver-simulation PUBLIC
 
 target_link_libraries(libantares-solver-simulation PRIVATE
 		Antares::infoCollection
+		PUBLIC
+		yuni-static-core
+		Antares::study
+		Antares::result_writer
 )
diff --git a/src/tests/src/libs/antares/CMakeLists.txt b/src/tests/src/libs/antares/CMakeLists.txt
@@ -46,7 +46,6 @@ target_include_directories(tests-matrix-save
 									"${src_libs_antares}/array"
 									"${src_libs_antares}/io"
 									"${src_libs_antares}/jit"
-									"${src_libs_antares}/logs"
 									"${src_libs_antares}/memory/include"
 									"${CMAKE_CURRENT_SOURCE_DIR}/logs"
 									"${CMAKE_CURRENT_SOURCE_DIR}/jit"

diff --git a/src/tests/src/solver/simulation/CMakeLists.txt b/src/tests/src/solver/simulation/CMakeLists.txt
@@ -45,6 +45,7 @@ target_link_libraries(test-store-timeseries-number
         test_utils_unit
 		libantares-solver-simulation
 		Antares::study
+		Antares::result_writer
 		)
 
 # Linux

diff --git a/src/tests/src/solver/simulation/test-store-timeseries-number.cpp b/src/tests/src/solver/simulation/test-store-timeseries-number.cpp
@@ -12,8 +12,8 @@
 #include "timeseries-numbers.h"
 #include "BindingConstraintsTimeSeriesNumbersWriter.h"
 #include "utils.h"
-#include "antares/writer/writer_factory.h"
-#include "antares/writer/result_format.h"
+#include <antares/writer/writer_factory.h>
+#include <antares/writer/result_format.h>
 
 using namespace Antares::Solver;
 using namespace Antares::Data;

diff --git a/src/ui/simulator/toolbox/components/datagrid/dbgrid.h b/src/ui/simulator/toolbox/components/datagrid/dbgrid.h
@@ -28,6 +28,7 @@
 #define __ANTARES_TOOLBOX_COMPONENT_DATAGRID_DBGRID_H__
 
 #include <wx/grid.h>
+#include <yuni/yuni.h>
 
 namespace Antares
 {

diff --git a/src/ui/simulator/toolbox/components/datagrid/filter/operator.list.h b/src/ui/simulator/toolbox/components/datagrid/filter/operator.list.h
@@ -28,6 +28,7 @@
 #define __ANTARES_TOOLBOX_FILTER_OPERATOR_LIST_H__
 
 #include <wx/string.h>
+#include <yuni/yuni.h>
 #include <vector>
 
 namespace Antares

diff --git a/src/ui/simulator/toolbox/create.h b/src/ui/simulator/toolbox/create.h
@@ -30,6 +30,7 @@
 #include <wx/sizer.h>
 #include <wx/button.h>
 #include <wx/stattext.h>
+#include <yuni/yuni.h>
 
 namespace Antares
 {