blob: 953b0d9e8e1d18fea0d43f362d7904cda7b7e026 [file] [log] [blame]
Patrick Williams2a254922023-08-11 09:48:11 -05001From f99c3f1f516a84d33794f8e3da59adea1a12ef54 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com>
3Date: Tue, 20 Jun 2023 22:42:51 +0800
4Subject: [PATCH] CMakeLists.txt: make 2 variables configurable
5
6Variables PREFERRED_PYTHON_PATH and PYTHON3_PATH are set with
7${PYTHON_EXECUTABLE}. For cross compile, ${PYTHON_EXECUTABLE} may point
8to other path rather than standard dir such as /usr/bin. Then the
9generated library file contains such path which should NOT. Update to
10make variables PREFERRED_PYTHON_PATH and PYTHON3_PATH configurable to
11avoid such issue.
12
13Upstream-Status: Submitted [https://github.com/OpenSCAP/openscap/pull/1990]
14
15Signed-off-by: Kai Kang <kai.kang@windriver.com>
16---
17 CMakeLists.txt | 4 ++--
18 1 file changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/CMakeLists.txt b/CMakeLists.txt
21index 5db014e77..74628cdd4 100644
22--- a/CMakeLists.txt
23+++ b/CMakeLists.txt
24@@ -125,8 +125,8 @@ endif()
25 find_package(PythonInterp 3)
26 find_package(PythonLibs 3)
27
28-set(PREFERRED_PYTHON_PATH "${PYTHON_EXECUTABLE}")
29-set(PYTHON3_PATH "${PYTHON_EXECUTABLE}")
30+set(PREFERRED_PYTHON_PATH "${PYTHON_EXECUTABLE}" CACHE PATH "Path to preferred Python")
31+set(PYTHON3_PATH "${PYTHON_EXECUTABLE}" CACHE PATH "Path to Python3")
32
33 find_package(RPM)
34 if(RPM_FOUND)
35--
362.34.1
37