From 70e672af778154fc99f5b9f24e83bd55672af466 Mon Sep 17 00:00:00 2001 From: Andrea Sgattoni Date: Thu, 22 Aug 2024 15:17:50 +0200 Subject: [PATCH] try fix oracle python3 --- CMakeLists.txt | 3 ++- docker/centos.dockerfile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 10018c0..b1bcae2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,7 @@ if (NOT DEFINED ortools_REF) message(FATAL_ERROR "ortools_REF is not defined") endif () find_package (Python REQUIRED) +message("found PYTHON interpreter ${Python_EXECUTABLE} = " ${Python_EXECUTABLE}) FetchContent_Declare(ortools GIT_REPOSITORY ${ortools_REPO} GIT_TAG ${ortools_REF} @@ -21,7 +22,7 @@ FetchContent_Declare(ortools ${CMAKE_CURRENT_SOURCE_DIR}/patch_utils.py ${CMAKE_CURRENT_SOURCE_DIR}/ortools ${CMAKE_CURRENT_SOURCE_DIR}/patchs - . && ${PYTHON_EXECUTABLE} patch.py + . && ${Python_EXECUTABLE} patch.py OVERRIDE_FIND_PACKAGE ON ) message("BUILD_DEPS: " ${BUILD_DEPS}) diff --git a/docker/centos.dockerfile b/docker/centos.dockerfile index cda9f72..577c8ca 100644 --- a/docker/centos.dockerfile +++ b/docker/centos.dockerfile @@ -55,7 +55,7 @@ FROM base AS devel ARG SIRIUS=OFF ARG SHARED=ON ARG BUILD_EXAMPLES=OFF -ARG OR_REPO="https://github.com/rte-france/or-tools.git" +ARG OR_REPO="https://github.com/google/or-tools.git" ARG OR_REF="stable" WORKDIR /home/project COPY . .