From 36b9ef0102e8ad0822d0b11bc73946f6b454ed50 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Mon, 25 Mar 2024 15:44:41 -0400 Subject: [PATCH] [cmake] Remove redundant W2DYN_ROOT and do not forward Python Executable information --- CMakeLists.txt | 2 -- test/python/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 40ada08..19548cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,9 +73,7 @@ message(STATUS "-------- BUILD-TYPE: ${CMAKE_BUILD_TYPE} --------") # w2dynamics specific variables get_property(FFTW_LIBRARIES TARGET triqs::fftw PROPERTY INTERFACE_LINK_LIBRARIES) -set(Python_EXECUTABLE ${TRIQS_PYTHON_EXECUTABLE}) set(W2DYN_GIT_HASH 7364c00) -set(W2DYN_ROOT ${PROJECT_BINARY_DIR}/w2dyn_project/src/w2dynamics) message(STATUS "w2dynamics git hash: ${W2DYN_GIT_HASH}") include(FetchContent) diff --git a/test/python/CMakeLists.txt b/test/python/CMakeLists.txt index a4863ef..057a0d9 100644 --- a/test/python/CMakeLists.txt +++ b/test/python/CMakeLists.txt @@ -22,5 +22,5 @@ foreach(test ${all_tests}) $<$:--libcxx> WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir} ) - set_property(TEST Py_${test_name} APPEND PROPERTY ENVIRONMENT PYTHONPATH=${PROJECT_BINARY_DIR}/python:${W2DYN_ROOT}:$ENV{PYTHONPATH}) + set_property(TEST Py_${test_name} APPEND PROPERTY ENVIRONMENT PYTHONPATH=${PROJECT_BINARY_DIR}/python:${w2dynamics_SOURCE_DIR}:$ENV{PYTHONPATH}) endforeach()