From 2788a3a409f3d2b6a04ab90819f3c61bd6a2b282 Mon Sep 17 00:00:00 2001 From: Florian OMNES Date: Mon, 19 Dec 2022 16:20:42 +0100 Subject: [PATCH] Use antares-integration-v1.3 --- CMakeLists.txt | 4 ++-- README.md | 2 +- cmake/dependencies/CMakeLists.txt | 2 +- repository-config.txt.cmake | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30d67ba..c13fb50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,8 +35,8 @@ message(STATUS "Build sirius solver: ${BUILD_sirius}") if(NOT sirius_solver_REPO) set(sirius_solver_REPO "https://github.com/rte-france/sirius-solver.git") endif() -if(NOT sirius_solver_BRANCH) - set(sirius_solver_BRANCH "antares_integration") +if(NOT sirius_solver_TAG) + set(sirius_solver_TAG "antares-integration-v1.3") endif() diff --git a/README.md b/README.md index f60663e..8c8c467 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ Here is a list of other available CMake configure option : |`CMAKE_BUILD_TYPE` |Define build type. Available values are `Release` and `Debug` | `Release`| |`DEPS_INSTALL_DIR`|Define libraries install directory| `/../rte-antares-deps-`| |`sirius_solver_REPO`| Define Sirius solver repository used| `https://github.com/rte-france/sirius-solver`| -|`sirius_solver_BRANCH`| Define Sirius solver branch used| `antares_integration`| +|`sirius_solver_TAG`| Define Sirius solver tag used| `antares_integration-v1.3`| Note: > `DEPS_INSTALL_DIR` is added to `CMAKE_PREFIX_PATH` diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt index f74dab9..5dd7747 100644 --- a/cmake/dependencies/CMakeLists.txt +++ b/cmake/dependencies/CMakeLists.txt @@ -44,7 +44,7 @@ if(BUILD_sirius) REPOSITORY ${sirius_solver_REPO} TAG - ${sirius_solver_BRANCH} + ${sirius_solver_TAG} SOURCE_SUBDIR "src" ) diff --git a/repository-config.txt.cmake b/repository-config.txt.cmake index f400259..b541e15 100644 --- a/repository-config.txt.cmake +++ b/repository-config.txt.cmake @@ -1,2 +1,2 @@ Sirius solver repository : @sirius_solver_REPO@ -Sirius solver branch : @sirius_solver_BRANCH@ +Sirius solver branch : @sirius_solver_TAG@