Skip to content

Commit 072d89a

Browse files
committed
next tial
1 parent 02185d8 commit 072d89a

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/intel/ad-rss-lib.svg)](https://github.com/intel/ad-rss-lib/releases/latest)
66
[![Build Status](https://github.com/intel/ad-rss-lib/workflows/Test/badge.svg?branch=main)](https://github.com/intel/ad-rss-lib/actions?query=workflow%3A%22Test%22)
77
[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8374/badge)](https://www.bestpractices.dev/projects/8374)
8+
[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/intel/ad-rss-lib/badge)](https://securityscorecards.dev/viewer/?uri=github.com/intel/ad-rss-lib)
9+
810

911
# Table of contents
1012
1. [Introduction](#introduction)

cmake/python-binding.cmake

+8-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,14 @@ function(find_python_binding_packages)
6969
endfunction()
7070

7171
function(get_python_test_environment)
72+
set(LIBDIR_PREFIX "local/")
73+
set(PACKAGE_FOLDER_NAME "dist-packages")
74+
if ("${PYTHON_BINDING_FOLDER_NAME}" STREQUAL "python3.8")
75+
set(LIBDIR_PREFIX "")
76+
set(PACKAGE_FOLDER_NAME "site-packages")
77+
endif()
7278
set(TEST_LD_LIBRARY_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
73-
set(TEST_PYTHONPATH "${CMAKE_INSTALL_PREFIX}/local/${CMAKE_INSTALL_LIBDIR}/${PYTHON_BINDING_FOLDER_NAME}/dist-packages")
79+
set(TEST_PYTHONPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR_PREFIX}${CMAKE_INSTALL_LIBDIR}/${PYTHON_BINDING_FOLDER_NAME}/${PACKAGE_FOLDER_NAME}")
7480
foreach(dep ${ARGN})
7581
get_target_property(dep_configurations ${dep} IMPORTED_CONFIGURATIONS)
7682
set(TEST_${dep}_LOCATION False)
@@ -84,7 +90,7 @@ function(get_python_test_environment)
8490
if(TEST_${dep}_LOCATION)
8591
set(TEST_LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${TEST_${dep}_LOCATION}")
8692
string(REGEX REPLACE "/${CMAKE_INSTALL_LIBDIR}$" "" TEST_${dep}_INSTALL_PREFIX ${TEST_${dep}_LOCATION})
87-
set(TEST_PYTHONPATH "${TEST_PYTHONPATH}:${TEST_${dep}_INSTALL_PREFIX}/local/${CMAKE_INSTALL_LIBDIR}/${PYTHON_BINDING_FOLDER_NAME}/dist-packages")
93+
set(TEST_PYTHONPATH "${TEST_PYTHONPATH}:${TEST_${dep}_INSTALL_PREFIX}/${LIBDIR_PREFIX}${CMAKE_INSTALL_LIBDIR}/${PYTHON_BINDING_FOLDER_NAME}/${PACKAGE_FOLDER_NAME}")
8894
else()
8995
message(WARNING "Failed to query mandatory location of dependency ${dep}")
9096
endif()

0 commit comments

Comments
 (0)