Remove dependency to UI : replace the dependency to UI in other stand…

… alone targets + correct new target include files paths
AntaresSimulatorTeam · Oct 5, 2023 · c2b28a8 · c2b28a8
1 parent 2139c7c
commit c2b28a8
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 14 deletions.
diff --git a/src/libs/antares/args/CMakeLists.txt b/src/libs/antares/args/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(SRC_ARGS_HELPER
-        args_to_utf8.h
+        include/antares/args/args_to_utf8.h
         args_to_utf8.cpp
 )
 
@@ -18,5 +18,5 @@ target_link_libraries(args_helper
 
 target_include_directories(args_helper
         PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
diff --git a/src/libs/antares/args/args_to_utf8.cpp b/src/libs/antares/args/args_to_utf8.cpp
@@ -1,6 +1,6 @@
 
 #include <yuni/yuni.h>
-#include "args_to_utf8.h"
+#include "antares/args/args_to_utf8.h"
 
 
 #ifdef YUNI_OS_WINDOWS

diff --git a/src/libs/antares/args/args_to_utf8.h b/src/libs/antares/args/args_to_utf8.h
diff --git a/src/tools/batchrun/CMakeLists.txt b/src/tools/batchrun/CMakeLists.txt
@@ -39,6 +39,7 @@ set(BATCHRUN_LIBS
 		antares-core #local.h
 		yuni-static-core
 		${CMAKE_THREADS_LIBS_INIT}
+		Antares::args_helper
 		Antares::study
 )
 

diff --git a/src/tools/batchrun/main.cpp b/src/tools/batchrun/main.cpp
@@ -35,7 +35,7 @@
 #include <yuni/core/string.h>
 #include <yuni/core/getopt.h>
 #include <antares/study/finder.h>
-#include "../../ui/common/winmain.hxx"
+#include <antares/args/args_to_utf8.h>
 #include <antares/version.h>
 #include <antares/locale.h>
 #ifdef YUNI_OS_WINDOWS

diff --git a/src/tools/cleaner/CMakeLists.txt b/src/tools/cleaner/CMakeLists.txt
@@ -26,6 +26,7 @@ INSTALL(EXPORT antares-study-cleaner
 
 set(CLEANER_LIBS
 	yuni-static-core
+	Antares::args_helper
 	Antares::study
 	Antares::sys
 	antares-core #version.h

diff --git a/src/tools/cleaner/main.cpp b/src/tools/cleaner/main.cpp
@@ -28,7 +28,7 @@
 #include <antares/logs/logs.h>
 #include <antares/study/finder.h>
 #include <yuni/core/getopt.h>
-#include "../../ui/common/winmain.hxx"
+#include <antares/args/args_to_utf8.h>
 #include <antares/utils/utils.h>
 #include <antares/study/cleaner.h>
 #include <antares/version.h>

diff --git a/src/tools/config/CMakeLists.txt b/src/tools/config/CMakeLists.txt
@@ -30,6 +30,7 @@ INSTALL(EXPORT antares-config
 
 set(CONFIG_LIBS
 		yuni-static-core
+		Antares::args_helper
 		${CMAKE_THREADS_LIBS_INIT}
 )
 

diff --git a/src/tools/config/main.cpp b/src/tools/config/main.cpp
@@ -29,7 +29,7 @@
 #include <antares/resources/resources.h>
 #include <iostream>
 #include <yuni/core/getopt.h>
-#include "../../ui/common/winmain.hxx"
+#include <antares/args/args_to_utf8.h>
 #include <antares/version.h>
 #include <yuni/core/system/username.h>
 #include <antares/locale.h>

diff --git a/src/tools/finder/CMakeLists.txt b/src/tools/finder/CMakeLists.txt
@@ -28,6 +28,7 @@ INSTALL(EXPORT antares-study-finder
 set(FINDER_LIBS
 	antares-core
 	yuni-static-core
+	Antares::args_helper
 	${CMAKE_THREADS_LIBS_INIT}
 )
 

diff --git a/src/tools/finder/main.cpp b/src/tools/finder/main.cpp
@@ -28,7 +28,7 @@
 #include <antares/logs/logs.h>
 #include <antares/study/finder.h>
 #include <yuni/core/getopt.h>
-#include "../../ui/common/winmain.hxx"
+#include <antares/args/args_to_utf8.h>
 #include <antares/utils/utils.h>
 #include <antares/version.h>
 #include <antares/locale.h>

diff --git a/src/tools/updater/CMakeLists.txt b/src/tools/updater/CMakeLists.txt
@@ -26,6 +26,7 @@ INSTALL(EXPORT antares-study-updater
 
 set(UPDATER_LIBS
 		yuni-static-core
+		Antares::args_helper
 		Antares::study
 		Antares::sys
 		antares-core #version.h

diff --git a/src/tools/updater/main.cpp b/src/tools/updater/main.cpp
@@ -29,7 +29,7 @@
 #include <antares/logs/logs.h>
 #include <antares/study/finder.h>
 #include <yuni/core/getopt.h>
-#include "../../ui/common/winmain.hxx"
+#include <antares/args/args_to_utf8.h>
 #include <antares/utils/utils.h>
 #include <antares/study/cleaner.h>
 #include <antares/version.h>

diff --git a/src/tools/vacuum/CMakeLists.txt b/src/tools/vacuum/CMakeLists.txt
@@ -36,6 +36,7 @@ set(VACUUM_LIBS
 	antares-fswalker
 	yuni-static-core
 	${CMAKE_THREADS_LIBS_INIT}
+	Antares::args_helper
 	Antares::study
 )
 

diff --git a/src/tools/vacuum/main.cpp b/src/tools/vacuum/main.cpp
@@ -35,7 +35,7 @@
 #include <antares/antares.h>
 #include <fswalker/fswalker.h>
 #include <antares/logs/logs.h>
-#include "../../ui/common/winmain.hxx"
+#include <antares/args/args_to_utf8.h>
 #include <antares/version.h>
 #include <antares/locale.h>
 #include "modified-inode.h"

diff --git a/src/tools/yby-aggregator/CMakeLists.txt b/src/tools/yby-aggregator/CMakeLists.txt
@@ -48,6 +48,7 @@ INSTALL(EXPORT antares-ybyaggregator
 
 set(YBY_AGGREGATOR_LIBS
 	antares-core #version.h
+	Antares::args_helper
 	Antares::date
 	Antares::logs
 	yuni-static-core

diff --git a/src/tools/yby-aggregator/main.cpp b/src/tools/yby-aggregator/main.cpp
@@ -28,7 +28,7 @@
 #include <yuni/yuni.h>
 #include <antares/logs/logs.h>
 #include <yuni/core/getopt.h>
-#include "../../ui/common/winmain.hxx"
+#include <antares/args/args_to_utf8.h>
 #include <antares/utils/utils.h>
 #include <antares/version.h>
 #include <antares/sys/policy.h>