56 lines
2.5 KiB
Diff
56 lines
2.5 KiB
Diff
From 83075c1bd26890ef8e5a1186246e965db89b487b Mon Sep 17 00:00:00 2001
|
|
From: desert-sailor <dongxing.wang_a@thundersoft.com>
|
|
Date: Fri, 22 Mar 2024 11:26:53 +0800
|
|
Subject: [PATCH 2/2] Fix build error with pre-installed version in the PATH
|
|
|
|
---
|
|
swig/python/CMakeLists.txt | 7 ++++++-
|
|
swig/python/install_python.cmake.in | 9 +++++++--
|
|
2 files changed, 13 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt
|
|
index b9c35c9..ca2bd0e 100644
|
|
--- a/swig/python/CMakeLists.txt
|
|
+++ b/swig/python/CMakeLists.txt
|
|
@@ -270,9 +270,14 @@ if (Python_Interpreter_FOUND)
|
|
set(GDAL_LIB_DEP_FOR_PY_SO "${GDAL_LIB_TARGET_NAME}")
|
|
endif()
|
|
|
|
+ if(WIN32)
|
|
+ set(PATH_SEP ";")
|
|
+ else()
|
|
+ set(PATH_SEP ":")
|
|
+ endif()
|
|
add_custom_command(
|
|
OUTPUT ${PY_SO_LIST}
|
|
- COMMAND ${CMAKE_COMMAND} ${WERROR_DEV_FLAG} -P "${BUILD_EXT_FILENAME}"
|
|
+ COMMAND ${CMAKE_COMMAND} -E env "\"PATH=${PROJECT_BINARY_DIR}/apps${PATH_SEP}$ENV{PATH}\"" ${CMAKE_COMMAND} ${WERROR_DEV_FLAG} -P "${BUILD_EXT_FILENAME}"
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
|
DEPENDS ${GDAL_LIB_DEP_FOR_PY_SO} ${GDAL_PYTHON_PYSOURCES} ${GDAL_PYTHON_CSOURCES} "${BUILD_EXT_FILENAME}"
|
|
${PROJECT_SOURCE_DIR}/gcore/gdal_priv.h)
|
|
diff --git a/swig/python/install_python.cmake.in b/swig/python/install_python.cmake.in
|
|
index 7c812b5..f24bd19 100644
|
|
--- a/swig/python/install_python.cmake.in
|
|
+++ b/swig/python/install_python.cmake.in
|
|
@@ -17,10 +17,15 @@ endif()
|
|
if(NOT "@SETUPTOOLS_USE_DISTUTILS@x" STREQUAL "x")
|
|
set(ENV{SETUPTOOLS_USE_DISTUTILS} @SETUPTOOLS_USE_DISTUTILS@)
|
|
endif()
|
|
+if(WIN32)
|
|
+ set(PATH_SEP ";")
|
|
+else()
|
|
+ set(PATH_SEP ":")
|
|
+endif()
|
|
if(DEFINED INSTALL_PREFIX)
|
|
- execute_process(COMMAND "@Python_EXECUTABLE_CMAKE@" "@SETUP_PY_FILENAME@" install ${ROOT_DIR_ARG} @INSTALL_ARGS@ "${INSTALL_PREFIX}"
|
|
+ execute_process(COMMAND ${CMAKE_COMMAND} -E env "PATH=@PROJECT_BINARY_DIR@/apps${PATH_SEP}$ENV{PATH}" "@Python_EXECUTABLE_CMAKE@" "@SETUP_PY_FILENAME@" install ${ROOT_DIR_ARG} @INSTALL_ARGS@ "${INSTALL_PREFIX}"
|
|
WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@")
|
|
else()
|
|
- execute_process(COMMAND "@Python_EXECUTABLE_CMAKE@" "@SETUP_PY_FILENAME@" install ${ROOT_DIR_ARG} @INSTALL_ARGS@
|
|
+ execute_process(COMMAND ${CMAKE_COMMAND} -E env "PATH=@PROJECT_BINARY_DIR@/apps${PATH_SEP}$ENV{PATH}" "@Python_EXECUTABLE_CMAKE@" "@SETUP_PY_FILENAME@" install ${ROOT_DIR_ARG} @INSTALL_ARGS@
|
|
WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@")
|
|
endif()
|
|
--
|
|
2.43.0
|
|
|