From 733a84da3f6ca1e697c0ace9f0a6a3d67b1b0f7c Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Mon, 27 Oct 2025 11:52:48 +0100 Subject: [PATCH] Use ENVIRONMENT_MODIFICATION instead of ENVIRONMENT for PYTHONPATH --- CMakeLists.txt | 2 +- test/python/CMakeLists.txt | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8033c5c..0116720 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ # # ############################################################################## -cmake_minimum_required(VERSION 3.20 FATAL_ERROR) +cmake_minimum_required(VERSION 3.22 FATAL_ERROR) cmake_policy(VERSION ${CMAKE_VERSION}) # ############ diff --git a/test/python/CMakeLists.txt b/test/python/CMakeLists.txt index aa9d877..1a3344c 100644 --- a/test/python/CMakeLists.txt +++ b/test/python/CMakeLists.txt @@ -11,5 +11,8 @@ foreach(test ${all_tests}) get_filename_component(test_name ${test} NAME_WE) get_filename_component(test_dir ${test} DIRECTORY) add_test(NAME Py_${test_name} COMMAND ${TRIQS_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${test_dir}/${test_name}.py WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir}) - set_property(TEST Py_${test_name} APPEND PROPERTY ENVIRONMENT PYTHONPATH=${PROJECT_BINARY_DIR}/python:$ENV{PYTHONPATH} ${SANITIZER_RT_PRELOAD}) + set_property(TEST Py_${test_name} APPEND PROPERTY ENVIRONMENT_MODIFICATION + "PYTHONPATH=path_list_prepend:${PROJECT_BINARY_DIR}/python" + "PYTHONPATH=path_list_prepend:$ENV{PYTHONPATH}") + set_property(TEST Py_${test_name} APPEND PROPERTY ENVIRONMENT ${SANITIZER_RT_PRELOAD}) endforeach()