From 002fbf2b6d7c98cd675113460da493b956782afc Mon Sep 17 00:00:00 2001 From: matekelemen Date: Thu, 12 Jun 2025 15:54:50 +0200 Subject: [PATCH 01/11] set install directories depending on target type --- CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 427c1811..4de8067b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,7 +138,11 @@ include(GenerateExportHeader) generate_export_header( co_sim_io EXPORT_MACRO_NAME CO_SIM_IO_API EXPORT_FILE_NAME ${CMAKE_CURRENT_SOURCE_DIR}/co_sim_io/includes/co_sim_io_api.hpp ) -install(TARGETS co_sim_io DESTINATION bin) +install(TARGETS co_sim_io + LIBRARY DESTINATION libs + ARCHIVE DESTINATION libs + RUNTIME DESTINATION bin + INCLUDES DESTINATION include) if (CO_SIM_IO_BUILD_MPI) # optionally enable communication via MPI @@ -157,7 +161,11 @@ if (CO_SIM_IO_BUILD_MPI) target_link_libraries(co_sim_io_mpi co_sim_io ${MPI_LIBRARIES}) - install(TARGETS co_sim_io_mpi DESTINATION bin) + install(TARGETS co_sim_io_mpi + LIBRARY DESTINATION libs + ARCHIVE DESTINATION libs + RUNTIME DESTINATION bin + INCLUDES DESTINATION include) endif() target_include_directories(co_sim_io PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/co_sim_io) From 759cebe07abeb67f7a8332fbbf99959e8877ed4f Mon Sep 17 00:00:00 2001 From: matekelemen Date: Fri, 13 Jun 2025 10:48:16 +0200 Subject: [PATCH 02/11] set rpath for tests --- tests/CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e6e07a9b..3e17be7c 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -10,6 +10,7 @@ set_target_properties(co_sim_io_tests PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED YES CXX_EXTENSIONS NO + INSTALL_RPATH "$ORIGIN/../libs" ) doctest_discover_tests(co_sim_io_tests TEST_PREFIX "cpp_" WORKING_DIRECTORY $) @@ -23,6 +24,7 @@ if (CO_SIM_IO_BUILD_MPI) CXX_STANDARD 11 CXX_STANDARD_REQUIRED YES CXX_EXTENSIONS NO + INSTALL_RPATH "$ORIGIN/../libs" ) doctest_discover_tests(co_sim_io_mpi_tests TEST_PREFIX "cpp_mpi_" WORKING_DIRECTORY $ TEST_EXECUTOR mpiexec TEST_EXECUTOR_ARGS -np 4) @@ -44,6 +46,7 @@ function(add_cpp_executable TEST_SOURCE_FILE) add_executable(${TEST_NAME} ${TEST_SOURCE_FILE}) target_link_libraries(${TEST_NAME} co_sim_io) install(TARGETS ${TEST_NAME} DESTINATION "bin/tests_cpp") + set_target_properties(${TEST_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/../../libs") endfunction() file(GLOB cpp_test_files "integration_tutorials/cpp/*.cpp") @@ -96,6 +99,7 @@ if (CO_SIM_IO_BUILD_MPI) add_executable(${TEST_NAME} ${TEST_SOURCE_FILE}) target_link_libraries(${TEST_NAME} co_sim_io_mpi) install(TARGETS ${TEST_NAME} DESTINATION "bin/tests_cpp_mpi") + set_target_properties(${TEST_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/../../libs") endfunction() file(GLOB cpp_mpi_test_files "integration_tutorials/cpp/mpi/*.cpp") @@ -120,6 +124,7 @@ if(CO_SIM_IO_BUILD_C) target_link_libraries(${TEST_NAME} co_sim_io_c) add_test(${TEST_NAME} ${TEST_NAME}) install(TARGETS ${TEST_NAME} DESTINATION "bin/tests_c") + set_target_properties(${TEST_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/../../libs") endfunction() function(add_c_executable TEST_SOURCE_FILE) @@ -129,6 +134,7 @@ if(CO_SIM_IO_BUILD_C) add_executable(${TEST_NAME} ${TEST_SOURCE_FILE}) target_link_libraries(${TEST_NAME} co_sim_io_c) install(TARGETS ${TEST_NAME} DESTINATION "bin/tests_c") + set_target_properties(${TEST_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/../../libs") endfunction() file(GLOB c_test_files @@ -162,6 +168,7 @@ if(CO_SIM_IO_BUILD_C) add_executable(${TEST_NAME} ${TEST_SOURCE_FILE}) target_link_libraries(${TEST_NAME} co_sim_io_c_mpi) install(TARGETS ${TEST_NAME} DESTINATION "bin/tests_c_mpi") + set_target_properties(${TEST_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/../../libs") endfunction() function(add_c_mpi_test TEST_SOURCE_FILE) @@ -172,6 +179,7 @@ if(CO_SIM_IO_BUILD_C) target_link_libraries(${TEST_NAME} co_sim_io_c_mpi) add_test(NAME ${TEST_NAME} COMMAND mpiexec -np 4 ${TEST_NAME}) install(TARGETS ${TEST_NAME} DESTINATION "bin/tests_c_mpi") + set_target_properties(${TEST_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/../../libs") endfunction() file(GLOB c_mpi_test_files "co_sim_io/c/mpi/*.c") @@ -208,6 +216,7 @@ if(CO_SIM_IO_BUILD_FORTRAN) target_link_libraries(${TEST_NAME} co_sim_io_fortran) add_test(${TEST_NAME} ${TEST_NAME}) install(TARGETS ${TEST_NAME} DESTINATION "bin/tests_fortran") + set_target_properties(${TEST_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/../../libs") endfunction() function(add_fortran_executable TEST_SOURCE_FILE) @@ -217,6 +226,7 @@ if(CO_SIM_IO_BUILD_FORTRAN) add_executable(${TEST_NAME} ${TEST_SOURCE_FILE}) target_link_libraries(${TEST_NAME} co_sim_io_fortran) install(TARGETS ${TEST_NAME} DESTINATION "bin/tests_fortran") + set_target_properties(${TEST_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/../../libs") endfunction() file(GLOB fortran_test_files From f93139e435dd1c6344d18ac628294b22290e9e6e Mon Sep 17 00:00:00 2001 From: matekelemen Date: Fri, 13 Jun 2025 14:03:57 +0200 Subject: [PATCH 03/11] set rpath for python bindings --- co_sim_io/python/CMakeLists.txt | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/co_sim_io/python/CMakeLists.txt b/co_sim_io/python/CMakeLists.txt index 021465d6..b7151bce 100644 --- a/co_sim_io/python/CMakeLists.txt +++ b/co_sim_io/python/CMakeLists.txt @@ -7,11 +7,24 @@ pybind11_add_module(PyCoSimIO co_sim_io_python.cpp) target_link_libraries( PyCoSimIO PRIVATE co_sim_io ) -install(TARGETS PyCoSimIO DESTINATION bin) -file(WRITE "${CMAKE_INSTALL_PREFIX}/bin/CoSimIO/__init__.py" "from PyCoSimIO import *\nfrom PyCoSimIO import __version__\n") +if (WIN32) + set(CoSimIOPythonModuleRelativeDir "${CMAKE_INSTALL_PREFIX}/bin/CoSimIO") +else() + set(CoSimIOPythonModuleRelativeDir "${CMAKE_INSTALL_PREFIX}/libs/CoSimIO") +endif() +set(CoSimIOPythonModuleDir "${CMAKE_INSTALL_PREFIX}/${CoSimIOPythonModuleRelativeDir}") + +install(TARGETS PyCoSimIO + LIBRARY DESTINATION "${CoSimIOPythonModuleRelativeDir}" + ARCHIVE DESTINATION "${CoSimIOPythonModuleRelativeDir}" + RUNTIME DESTINATION "${CoSimIOPythonModuleRelativeDir}") +set_target_properties(PyCoSimIO PROPERTIES INSTALL_RPATH "$ORIGIN/..") + +set(CoSimIOInitFile "${CoSimIOPythonModuleDir}/__init__.py") +set(CoSimIOMPIInitFile "${CoSimIOPythonModuleDir}/mpi/__init__.py") +set(mpi4pyInterfaceInitFile "${CoSimIOPythonModuleDir}/mpi/mpi4pyInterface/__init__.py") -set(CoSimIOMPIInitFile "${CMAKE_INSTALL_PREFIX}/bin/CoSimIO/mpi/__init__.py") -set(mpi4pyInterfaceInitFile "${CMAKE_INSTALL_PREFIX}/bin/CoSimIO/mpi/mpi4pyInterface/__init__.py") +file(WRITE "${CoSimIOInitFile}" "from PyCoSimIO import *\nfrom PyCoSimIO import __version__\n") # dummy init files that give proper errors in case something related to MPI was not compiled # These files will be overwritten if the corresponding option is enabled, hence here we can write then unconditionally @@ -24,6 +37,7 @@ if (CO_SIM_IO_BUILD_MPI) target_link_libraries( PyCoSimIOMPI PRIVATE co_sim_io co_sim_io_mpi ) install(TARGETS PyCoSimIOMPI DESTINATION bin) + set_target_properties(PyCoSimIOMPI PROPERTIES INSTALL_RPATH "$ORIGIN") file(WRITE ${CoSimIOMPIInitFile} "from PyCoSimIOMPI import *\n") OPTION ( CO_SIM_IO_BUILD_PYTHON_MPI4PY_INTERFACE "Building the interface to mpi4py MPI communicators" OFF ) @@ -32,6 +46,7 @@ if (CO_SIM_IO_BUILD_MPI) pybind11_add_module(PyCoSimIOMPI_mpi4pyInterface mpi4py_interface.cpp) target_link_libraries( PyCoSimIOMPI_mpi4pyInterface PRIVATE ${MPI_LIBRARIES} ) install(TARGETS PyCoSimIOMPI_mpi4pyInterface DESTINATION bin) + set_target_properties(PyCoSimIOMPI_mpi4pyInterface PROPERTIES INSTALL_RPATH "$ORIGIN") file(WRITE ${mpi4pyInterfaceInitFile} "from PyCoSimIOMPI_mpi4pyInterface import *\n") endif() endif() From ebc54508bb165c00ab98c181e6ea04b6e02cfac2 Mon Sep 17 00:00:00 2001 From: matekelemen Date: Fri, 13 Jun 2025 14:07:29 +0200 Subject: [PATCH 04/11] set install dirs of the C lib --- co_sim_io/c/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/co_sim_io/c/CMakeLists.txt b/co_sim_io/c/CMakeLists.txt index 557ddfca..adfa770e 100644 --- a/co_sim_io/c/CMakeLists.txt +++ b/co_sim_io/c/CMakeLists.txt @@ -12,7 +12,11 @@ set_target_properties(co_sim_io_c PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) target_link_libraries( co_sim_io_c co_sim_io ) -install(TARGETS co_sim_io_c DESTINATION bin) +install(TARGETS co_sim_io_c + LIBRARY DESTINATION libs + ARCHIVE DESTINATION libs + RUNTIME DESTINATION bin + INCLUDES DESTINATION include) if (CO_SIM_IO_BUILD_MPI) add_library (co_sim_io_c_mpi SHARED co_sim_io_c_mpi.cpp) From b5083ba362a7672ae033ae2c28d6489e74fbfed1 Mon Sep 17 00:00:00 2001 From: matekelemen Date: Fri, 13 Jun 2025 14:07:38 +0200 Subject: [PATCH 05/11] set install dirs of the fortran lib --- co_sim_io/fortran/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/co_sim_io/fortran/CMakeLists.txt b/co_sim_io/fortran/CMakeLists.txt index 2998f061..76a5cba1 100644 --- a/co_sim_io/fortran/CMakeLists.txt +++ b/co_sim_io/fortran/CMakeLists.txt @@ -6,4 +6,8 @@ add_library (co_sim_io_fortran SHARED co_sim_io.f90) target_link_libraries( co_sim_io_fortran co_sim_io_c ) -install(TARGETS co_sim_io_fortran DESTINATION bin) +install(TARGETS co_sim_io_fortran + LIBRARY DESTINATION libs + ARCHIVE DESTINATION libs + RUNTIME DESTINATION bin + INCLUDES DESTINATION include) From 4f952571fe4950f5a68f32c3d1daa8e326d969e0 Mon Sep 17 00:00:00 2001 From: matekelemen Date: Fri, 13 Jun 2025 14:24:08 +0200 Subject: [PATCH 06/11] update python and library paths in the CI --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b05271de..ff0a387d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -166,8 +166,8 @@ jobs: if [ ${{ matrix.compiler }} = ICPX ]; then source /opt/intel/oneapi/setvars.sh fi - export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/bin - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${GITHUB_WORKSPACE}/bin + export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/libs + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${GITHUB_WORKSPACE}/libs cd tests # TODO delete build dir to make sure the linking etc works correctly? python run_python_tests.py @@ -177,8 +177,8 @@ jobs: if [ ${{ matrix.compiler }} = ICPX ]; then source /opt/intel/oneapi/setvars.sh fi - export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/bin - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${GITHUB_WORKSPACE}/bin + export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/libs + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${GITHUB_WORKSPACE}/libs cd tests #TODO run the tests... # TODO delete build dir to make sure the linking etc works correctly? @@ -237,8 +237,8 @@ jobs: - name: Running tests run: | - export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/bin - export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${GITHUB_WORKSPACE}/bin + export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/libs + export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${GITHUB_WORKSPACE}/libs cd tests # TODO delete build dir to make sure the linking etc works correctly? python run_python_tests.py @@ -369,8 +369,8 @@ jobs: - name: Running tests (Python) run: | - export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/bin - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${GITHUB_WORKSPACE}/bin + export PYTHONPATH=${PYTHONPATH}:${GITHUB_WORKSPACE}/libs + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${GITHUB_WORKSPACE}/libs cd tests # TODO delete build dir to make sure the linking etc works correctly? (Needs to be done after running CTests) python3.8 run_python_tests.py From b196a534e1a54cafdd59b32a33d9d2326b82dadd Mon Sep 17 00:00:00 2001 From: matekelemen Date: Fri, 13 Jun 2025 16:36:27 +0200 Subject: [PATCH 07/11] set c mpi lib install path --- co_sim_io/c/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/co_sim_io/c/CMakeLists.txt b/co_sim_io/c/CMakeLists.txt index adfa770e..9cfe281a 100644 --- a/co_sim_io/c/CMakeLists.txt +++ b/co_sim_io/c/CMakeLists.txt @@ -23,5 +23,9 @@ if (CO_SIM_IO_BUILD_MPI) target_link_libraries(co_sim_io_c_mpi co_sim_io_c co_sim_io_mpi) - install(TARGETS co_sim_io_c_mpi DESTINATION bin) + install(TARGETS co_sim_io_c_mpi + LIBRARY DESTINATION libs + ARCHIVE DESTINATION libs + RUNTIME DESTINATION bin + INCLUDES DESTINATION include) endif() From ca8c4afda1f2e8dc26f8d0eded4c4ad59bb5fc3c Mon Sep 17 00:00:00 2001 From: matekelemen Date: Fri, 13 Jun 2025 16:36:54 +0200 Subject: [PATCH 08/11] fix python binary module install paths and rpaths --- co_sim_io/python/CMakeLists.txt | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/co_sim_io/python/CMakeLists.txt b/co_sim_io/python/CMakeLists.txt index b7151bce..ab133165 100644 --- a/co_sim_io/python/CMakeLists.txt +++ b/co_sim_io/python/CMakeLists.txt @@ -8,17 +8,17 @@ pybind11_add_module(PyCoSimIO co_sim_io_python.cpp) target_link_libraries( PyCoSimIO PRIVATE co_sim_io ) if (WIN32) - set(CoSimIOPythonModuleRelativeDir "${CMAKE_INSTALL_PREFIX}/bin/CoSimIO") + set(CoSimIOPythonModuleRelativeDir "bin/CoSimIO") else() - set(CoSimIOPythonModuleRelativeDir "${CMAKE_INSTALL_PREFIX}/libs/CoSimIO") + set(CoSimIOPythonModuleRelativeDir "libs/CoSimIO") endif() set(CoSimIOPythonModuleDir "${CMAKE_INSTALL_PREFIX}/${CoSimIOPythonModuleRelativeDir}") install(TARGETS PyCoSimIO - LIBRARY DESTINATION "${CoSimIOPythonModuleRelativeDir}" - ARCHIVE DESTINATION "${CoSimIOPythonModuleRelativeDir}" - RUNTIME DESTINATION "${CoSimIOPythonModuleRelativeDir}") -set_target_properties(PyCoSimIO PROPERTIES INSTALL_RPATH "$ORIGIN/..") + LIBRARY DESTINATION libs + ARCHIVE DESTINATION libs + RUNTIME DESTINATION bin) +set_target_properties(PyCoSimIO PROPERTIES INSTALL_RPATH "$ORIGIN") set(CoSimIOInitFile "${CoSimIOPythonModuleDir}/__init__.py") set(CoSimIOMPIInitFile "${CoSimIOPythonModuleDir}/mpi/__init__.py") @@ -28,25 +28,31 @@ file(WRITE "${CoSimIOInitFile}" "from PyCoSimIO import *\nfrom PyCoSimIO import # dummy init files that give proper errors in case something related to MPI was not compiled # These files will be overwritten if the corresponding option is enabled, hence here we can write then unconditionally -file(WRITE ${CoSimIOMPIInitFile} "raise Exception('CoSimIO was compiled without MPI support! (use \"CO_SIM_IO_BUILD_MPI\" to enable it)')\n") -file(WRITE ${mpi4pyInterfaceInitFile} "raise Exception('The mpi4py interface was not compiled! (use \"CO_SIM_IO_BUILD_PYTHON_MPI4PY_INTERFACE\" to enable it)')\n") +file(WRITE "${CoSimIOMPIInitFile}" "raise Exception('CoSimIO was compiled without MPI support! (use \"CO_SIM_IO_BUILD_MPI\" to enable it)')\n") +file(WRITE "${mpi4pyInterfaceInitFile}" "raise Exception('The mpi4py interface was not compiled! (use \"CO_SIM_IO_BUILD_PYTHON_MPI4PY_INTERFACE\" to enable it)')\n") if (CO_SIM_IO_BUILD_MPI) pybind11_add_module(PyCoSimIOMPI co_sim_io_python_mpi.cpp) target_link_libraries( PyCoSimIOMPI PRIVATE co_sim_io co_sim_io_mpi ) - install(TARGETS PyCoSimIOMPI DESTINATION bin) + install(TARGETS PyCoSimIOMPI + LIBRARY DESTINATION libs + ARCHIVE DESTINATION libs + RUNTIME DESTINATION bin) set_target_properties(PyCoSimIOMPI PROPERTIES INSTALL_RPATH "$ORIGIN") - file(WRITE ${CoSimIOMPIInitFile} "from PyCoSimIOMPI import *\n") + file(WRITE "${CoSimIOMPIInitFile}" "from PyCoSimIOMPI import *\n") OPTION ( CO_SIM_IO_BUILD_PYTHON_MPI4PY_INTERFACE "Building the interface to mpi4py MPI communicators" OFF ) if (CO_SIM_IO_BUILD_PYTHON_MPI4PY_INTERFACE) message("Building the interface to mpi4py MPI communicators") pybind11_add_module(PyCoSimIOMPI_mpi4pyInterface mpi4py_interface.cpp) target_link_libraries( PyCoSimIOMPI_mpi4pyInterface PRIVATE ${MPI_LIBRARIES} ) - install(TARGETS PyCoSimIOMPI_mpi4pyInterface DESTINATION bin) + install(TARGETS PyCoSimIOMPI_mpi4pyInterface + LIBRARY DESTINATION libs + ARCHIVE DESTINATION libs + RUNTIME DESTINATION bin) set_target_properties(PyCoSimIOMPI_mpi4pyInterface PROPERTIES INSTALL_RPATH "$ORIGIN") - file(WRITE ${mpi4pyInterfaceInitFile} "from PyCoSimIOMPI_mpi4pyInterface import *\n") + file(WRITE "${mpi4pyInterfaceInitFile}" "from PyCoSimIOMPI_mpi4pyInterface import *\n") endif() endif() From 4e452ba5054252278c84571ade96df7fff46500e Mon Sep 17 00:00:00 2001 From: matekelemen Date: Fri, 13 Jun 2025 16:55:39 +0200 Subject: [PATCH 09/11] update PYTHONPATH for the windows CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff0a387d..3e0c550a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -334,7 +334,7 @@ jobs: PYTHON_CMD: python # for the tests (subprocess) shell: cmd run: | - set PYTHONPATH=%PYTHONPATH%;%GITHUB_WORKSPACE%/bin + set PYTHONPATH=%PYTHONPATH%;%GITHUB_WORKSPACE%/libs cd tests rem TODO delete build dir to make sure the linking etc works correctly? python run_python_tests.py From d768f342e3ecf247508674b439a7763c15b25617 Mon Sep 17 00:00:00 2001 From: matekelemen Date: Fri, 13 Jun 2025 17:13:57 +0200 Subject: [PATCH 10/11] Revert "update PYTHONPATH for the windows CI" This reverts commit 4e452ba5054252278c84571ade96df7fff46500e. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e0c550a..ff0a387d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -334,7 +334,7 @@ jobs: PYTHON_CMD: python # for the tests (subprocess) shell: cmd run: | - set PYTHONPATH=%PYTHONPATH%;%GITHUB_WORKSPACE%/libs + set PYTHONPATH=%PYTHONPATH%;%GITHUB_WORKSPACE%/bin cd tests rem TODO delete build dir to make sure the linking etc works correctly? python run_python_tests.py From 2fae258ee6700e6dbe3f2ed0286660cf69df8ff6 Mon Sep 17 00:00:00 2001 From: matekelemen Date: Fri, 13 Jun 2025 17:21:55 +0200 Subject: [PATCH 11/11] debug print --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff0a387d..0ec22446 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -335,6 +335,10 @@ jobs: shell: cmd run: | set PYTHONPATH=%PYTHONPATH%;%GITHUB_WORKSPACE%/bin + + @REM show what's on your PYTHONPATH + dir %GITHUB_WORKSPACE%/bin + cd tests rem TODO delete build dir to make sure the linking etc works correctly? python run_python_tests.py