Python Test Examples: fix PYTHONPATH

Tests/Examples/CMakeLists.txt

@@ -37,7 +37,7 @@ endmacro()
 set(launch_env COMMAND ${CMAKE_COMMAND} -E env)
 set(launch_py
     BA_DATA_DIR=${EXAMPLES_DATA_DIR}
-    PYTHONPATH=${CMAKE_BINARY_DIR}/lib
+    PYTHONPATH=${BA_PY_SOURCE_OUTPUT_DIR}
     ${Python3_EXECUTABLE})
 
 # Register example that plots but has no persistence test.

Tests/Py/Fit/CMakeLists.txt

@@ -14,6 +14,6 @@ foreach(_test ${tests})
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_test} ${OUTPUT_DIR}/${_test} COPYONLY)
     add_test(NAME Py.Fit.${_test}
         WORKING_DIRECTORY ${OUTPUT_DIR}
-        COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+        COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${BA_PY_SOURCE_OUTPUT_DIR}
         ${Python3_EXECUTABLE} ${OUTPUT_DIR}/${_test})
 endforeach()

Tests/Py/Functional/CMakeLists.txt

@@ -16,6 +16,6 @@ foreach(_test ${tests})
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_test} ${OUTPUT_DIR}/${_test} COPYONLY)
     add_test(NAME Py.Functional.${_test}
         WORKING_DIRECTORY ${OUTPUT_DIR}
-        COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+        COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${BA_PY_SOURCE_OUTPUT_DIR}
         ${Python3_EXECUTABLE} ${OUTPUT_DIR}/${_test})
 endforeach()

Tests/Py/Unit/CMakeLists.txt

@@ -14,6 +14,6 @@ foreach(_test ${tests})
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_test} ${OUTPUT_DIR}/${_test} COPYONLY)
     add_test(NAME Py.Unit.${_test}
         WORKING_DIRECTORY ${OUTPUT_DIR}
-        COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+        COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${BA_PY_SOURCE_OUTPUT_DIR}
         ${Python3_EXECUTABLE} ${OUTPUT_DIR}/${_test})
 endforeach()

Tests/Suite/Py/Check.cpp

@@ -46,12 +46,12 @@ std::vector<double> domainData(const std::string& test_name, const ISimulation&
 
     // Run Python script
 #ifndef _WIN32
-    const std::string sys_command = std::string("PYTHONPATH=") + BABuild::buildLibDir() + " "
+    const std::string sys_command = std::string("PYTHONPATH=") + BABuild::pythonPackDir() + " "
                                     + std::string("NOSHOW=TRUE") + " " + BABuild::pythonExecutable()
                                     + " -B " + pyscript;
 #else
-    const std::string sys_command = std::string("set PYTHONPATH=") + BABuild::buildLibDir() + " & "
-                                    + std::string("set NOSHOW=TRUE") + " & \""
+    const std::string sys_command = std::string("set PYTHONPATH=") + BABuild::pythonPackDir()
+                                    + " & " + std::string("set NOSHOW=TRUE") + " & \""
                                     + BABuild::pythonExecutable() + "\" -B " + pyscript;
 #endif
     std::cout << "- system call: " << sys_command << std::endl;