Skip to content

Commit

Permalink
Split study in CMakefile (#1583)
Browse files Browse the repository at this point in the history
* Move writer in libs

* wip

* Benchmarking

* Remove extra dependency

* Move writer in libs

* Fix post rebase

* Remove Yuni target include

* Lots of lib change

* Lots of lib change

* Remove extra writer dependency

* Improve Cmake correlation

* Improve Cmake checks

* Improve Cmake benchmarking

* Improve Cmake array

* Improve Cmake exception

* Improve Cmake inifile

* Improve Cmake io

* Improve Cmake jit

* Improve Cmake logs

* Fix date cmake

* Fix compil for logs

* Sys wip

* Memory wip

* Finish Memory/sys

* Fix post merge

* Remove extra include

* Fix include

* Remove sys as direct dependency of antares-core (#1561)

* Remove memory usage

* Fix merge

* Remove extra dependency

* Move public dependency as private

* Remove deprecated dependency

* Split Duration collector and StudyInfoCollector

* Move OptimizationInfo in proper place

* Split SimulationInfoCollection from Benchmarking

* Split study in CMakefile

* Fix merge

* Remove lots of libs from core

* Remove dependency to libantares-core

* Fix boost compil

* Fix boost compil

* Fix hostname/policy link error

* Add missing link to thermal definition

* Make yuni public in lib-matrix for test

* Loosen build parallelization

* Try fix

* Remove extra include to log causing link error

* Fix windows compilation: missing link to winsock

* Fix UI compilation

* Revert removing -j options during CI

* 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

---------

Co-authored-by: Jason Marechal <[email protected]>
  • Loading branch information
JasonMarechal25 and JasonMarechal authored Sep 12, 2023
1 parent d392658 commit b6d0993
Show file tree
Hide file tree
Showing 335 changed files with 919 additions and 1,106 deletions.
7 changes: 4 additions & 3 deletions src/analyzer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,12 @@ INSTALL(EXPORT antares-analyzer

target_link_libraries(antares-${ANTARES_PRG_VERSION}-analyzer
PRIVATE
libantares-core
Antares::date
Antares::sys
yuni-static-core
${CMAKE_THREADS_LIBS_INIT}
libantares-core #local.h
PUBLIC
Antares::study #atsp -> xcast
Antares::sys
)

import_std_libs(antares-${ANTARES_PRG_VERSION}-analyzer)
Expand Down
2 changes: 1 addition & 1 deletion src/analyzer/atsp/atsp.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <memory>
#include <yuni/core/string.h>
#include <antares/study/xcast/xcast.h>
#include <antares/study.h>
#include <antares/study/study.h>

namespace Antares
{
Expand Down
Loading

0 comments on commit b6d0993

Please sign in to comment.