Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correctif cmakelist jenkins #93

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Correctif cmakelist jenkins #93

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2e3dc5e
modif CMakeLists
rolnico Sep 11, 2023
735617f
logs
rolnico Sep 11, 2023
b41eda8
logs
rolnico Sep 11, 2023
21c3a96
logs
rolnico Sep 11, 2023
3063535
logs
rolnico Sep 11, 2023
b8b87e8
logs
rolnico Sep 11, 2023
0e5eef2
logs
rolnico Sep 11, 2023
50501a1
logs
rolnico Sep 11, 2023
8213e64
logs
rolnico Sep 11, 2023
780d2b9
code cleaning
rolnico Sep 11, 2023
5f55548
code cleaning
rolnico Sep 11, 2023
f34ff68
Merge branch 'main' into correctif_cmakelist_jenkins
rolnico Sep 19, 2023
2809883
Merge branch 'main' into correctif_cmakelist_jenkins
rolnico Oct 17, 2023
c1c180a
Merge branch 'main' into correctif_cmakelist_jenkins
rolnico Nov 10, 2023
4196c35
Merge branch 'main' into correctif_cmakelist_jenkins
rolnico Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions metrix-simulator/external/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,26 +32,23 @@ include(ExternalProject)
include(GetPatchCommand)
include(CloneUrl)

set(suitesparse_url https://github.com/DrTimothyAldenDavis/SuiteSparse.git)
set(suitesparse_github_url https://github.com/DrTimothyAldenDavis/SuiteSparse.git)
set(suitesparse_tag_version v5.4.0)

if(DEFINED ENV{NNI} AND DEFINED ENV{NNI_PASSWORD})
get_url(NAME suitesparse URL ${suitesparse_url} NNI $ENV{NNI} PASSWORD $ENV{NNI_PASSWORD})
set(suitesparse_url ${SUITEPARSE_URL})
endif()

set(SUITESPARSE_HOME ${CMAKE_CURRENT_BINARY_DIR}/suitesparse)
GetPatchCommand(${CMAKE_CURRENT_SOURCE_DIR} suitesparse)
if(SuiteSparse_FOUND)
message(STATUS "SuiteSparse Already found")
add_custom_target(suitesparse)
else()
message(STATUS "Downloading SuiteSparse")
ExternalProject_Add(suitesparse
INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/suitesparse
TMP_DIR ${TMP_DIR}
STAMP_DIR ${DOWNLOAD_DIR}/suitesparse-stamp
SOURCE_DIR ${DOWNLOAD_DIR}/suitesparse
BINARY_DIR ${DOWNLOAD_DIR}/suitesparse-build
GIT_REPOSITORY ${suitesparse_url}
GIT_REPOSITORY ${suitesparse_github_url}
GIT_TAG refs/tags/${suitesparse_tag_version}
PATCH_COMMAND ${suitesparse_patch}

Expand All @@ -66,16 +63,12 @@ endif()

set(sirius_solver_url https://github.com/rte-france/sirius-solver.git)

if(DEFINED ENV{NNI} AND DEFINED ENV{NNI_PASSWORD})
get_url(NAME sirius URL ${sirius_solver_url} NNI $ENV{NNI} PASSWORD $ENV{NNI_PASSWORD})
set(sirius_solver_url ${SIRIUS_URL})
endif()

set(sirius_solver_ROOT ${CMAKE_CURRENT_BINARY_DIR}/sirius_solver)
find_package(sirius_solver QUIET)
if(sirius_solver_FOUND)
message(STATUS "Sirius solver already found")
else()
message(STATUS "Downloading Sirius solver")
ExternalProject_Add(sirius_solver
INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/sirius_solver
TMP_DIR ${TMP_DIR}
Expand Down