File 0001-Revert-python-Fix-python-install-on-windows-breaks-L.patch of Package google-or-tools
From e0186b92a87dfda53a207fa584164300bee68315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Wed, 12 Jun 2024 18:59:51 +0200
Subject: [PATCH] Revert "python: Fix python-install on windows", breaks Linux
---
cmake/python-install.cmake.in | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/cmake/python-install.cmake.in b/cmake/python-install.cmake.in
index ff3aa86..7dcf606 100644
--- a/cmake/python-install.cmake.in
+++ b/cmake/python-install.cmake.in
@@ -11,9 +11,9 @@ if(DEFINED ENV{DESTDIR})
# If DESTDIR is not absolute path, make it relative to @PROJECT_BINARY_DIR@
# like any install() command.
if(IS_ABSOLUTE $ENV{DESTDIR})
- set(ROOT "--root='$ENV{DESTDIR}'")
+ set(ROOT "--root=$ENV{DESTDIR}")
else()
- set(ROOT "--root='@PROJECT_BINARY_DIR@/$ENV{DESTDIR}'")
+ set(ROOT "--root=@PROJECT_BINARY_DIR@/$ENV{DESTDIR}")
endif()
else()
set(ROOT "")
@@ -22,7 +22,7 @@ endif()
# Check if we have system Python on Debian/Ubuntu, if so tell setuptools
# to use the deb layout (dist-packages instead of site-packages).
execute_process(
- COMMAND "@Python3_EXECUTABLE@" -c "import sys; sys.stdout.write(sys.path[-1])"
+ COMMAND @Python3_EXECUTABLE@ -c "import sys; sys.stdout.write(sys.path[-1])"
OUTPUT_VARIABLE Python_STDLIB_DIR
)
if(Python_STDLIB_DIR MATCHES ".*/dist-packages$")
@@ -33,8 +33,9 @@ endif()
execute_process(
WORKING_DIRECTORY @PROJECT_BINARY_DIR@/python
- COMMAND "@Python3_EXECUTABLE@" setup.py install
+ COMMAND @Python3_EXECUTABLE@ setup.py install
${ROOT}
- --prefix="@CMAKE_INSTALL_PREFIX@"
+ --prefix=@CMAKE_INSTALL_PREFIX@
${SETUPTOOLS_INSTALL_LAYOUT}
+ COMMAND_ECHO STDERR
)
--
2.45.0