From a75e4e054fed96c8e2a1a65a59c1339f6483793d Mon Sep 17 00:00:00 2001 From: Jason Marechal Date: Wed, 18 Sep 2024 10:04:14 +0200 Subject: [PATCH] Fetch content Antares --- CMakeLists.txt | 21 +++++++------------ .../lpnamer/problem_modifier/CMakeLists.txt | 1 - 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4488c4fec..c32400120 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,16 +138,19 @@ if (${BUILD_antares_solver}) message(WARNING "Antares solver not found, will be build") set(REPOSITORY "https://github.com/AntaresSimulatorTeam/Antares_Simulator.git") set(TAG "v${ANTARES_VERSION_TAG}") - set(FETCHCONTENT_QUIET OFF) + set(FETCHCONTENT_UPDATES_DISCONNECTED TRUE) #To avoid fetching updates everytime + #set(FETCHCONTENT_QUIET FALSE) for more log FetchContent_Declare( Antares GIT_REPOSITORY ${REPOSITORY} - GIT_TAG ${TAG} - GIT_PROGRESS TRUE - USES_TERMINAL_DOWNLOAD TRUE + GIT_TAG feature/full_build_fixes + GIT_SHALLOW TRUE SOURCE_SUBDIR src GIT_SUBMODULES "" + #USES_TERMINAL_DOWNLOAD TRUE #For verbosity + #GIT_PROGRESS TRUE OVERRIDE_FIND_PACKAGE + EXCLUDE_FROM_ALL ) set(BUILD_ortools ON) set(BUILD_UI OFF) @@ -157,17 +160,7 @@ if (${BUILD_antares_solver}) FetchContent_MakeAvailable(Antares) endif () endif () -set(CMAKE_FIND_DEBUG_MODE ON) find_package(Antares REQUIRED) -fetchcontent_declare( - TestAPI - GIT_REPOSITORY https://gitlab.com/JasonMarechal25/testapi.git - OVERRIDE_FIND_PACKAGE - SOURCE_SUBDIR lib -) -fetchcontent_makeavailable(TestAPI) -find_package(TestAPI REQUIRED) -set(CMAKE_FIND_DEBUG_MODE OFF) find_package(minizip-ng REQUIRED) # --------------------------------------------------------------------------- diff --git a/src/cpp/lpnamer/problem_modifier/CMakeLists.txt b/src/cpp/lpnamer/problem_modifier/CMakeLists.txt index 34b25da4c..559ac001e 100644 --- a/src/cpp/lpnamer/problem_modifier/CMakeLists.txt +++ b/src/cpp/lpnamer/problem_modifier/CMakeLists.txt @@ -56,7 +56,6 @@ target_include_directories (lp_namer_problem_modifier target_link_libraries (lp_namer_problem_modifier PUBLIC - TestApi::TestApi lp_namer_model lp_namer_input_reader lp_namer_helper