Fix dartpy PYTHONPATH for tests

Author: jslee02

python/CMakeLists.txt

@@ -38,6 +38,12 @@ endif()
 
 set(DART_PYTHON_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}")
 set(DART_DARTPY_BUILD_DIR "${DART_PYTHON_BUILD_DIR}/dartpy")
+if(WIN32)
+  # Use an escaped separator so the full value is passed as a single argument
+  set(DART_PYTHONPATH "${DART_DARTPY_BUILD_DIR}\\;${DART_PYTHON_BUILD_DIR}")
+else()
+  set(DART_PYTHONPATH "${DART_DARTPY_BUILD_DIR}:${DART_PYTHON_BUILD_DIR}")
+endif()
 
 add_subdirectory(dartpy)
 add_subdirectory(tests)

python/examples/CMakeLists.txt

@@ -10,8 +10,8 @@ function(dartpy_add_example example_name) # ARGN for source file
     set(source "${example_name}.py")
   endif()
   add_custom_target(${example_name}
-    COMMAND ${CMAKE_COMMAND} -E echo "Running pytest by: PYTHONPATH=${DART_PYTHON_BUILD_DIR} ${Python3_EXECUTABLE} ${source}"
-    COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${DART_PYTHON_BUILD_DIR} ${Python3_EXECUTABLE} ${source}"
+    COMMAND ${CMAKE_COMMAND} -E echo "Running pytest by: PYTHONPATH=${DART_PYTHONPATH} ${Python3_EXECUTABLE} ${source}"
+    COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${DART_PYTHONPATH}" ${Python3_EXECUTABLE} ${source}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     SOURCES ${source}
   )

python/tests/CMakeLists.txt

@@ -29,8 +29,8 @@ file(GLOB_RECURSE dartpy_test_files "test_*.py")
 # Add custom target to run the tests
 if(DARTPY_PYTEST_FOUND)
   add_custom_target(pytest
-    COMMAND ${CMAKE_COMMAND} -E echo "Running pytest by: PYTHONPATH=${DART_PYTHON_BUILD_DIR} ${Python3_EXECUTABLE} -m pytest [sources]"
-    COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH="${DART_PYTHON_BUILD_DIR}" "${Python3_EXECUTABLE}" -m pytest ${dartpy_test_files} -v
+    COMMAND ${CMAKE_COMMAND} -E echo "Running pytest by: PYTHONPATH=${DART_PYTHONPATH} ${Python3_EXECUTABLE} -m pytest [sources]"
+    COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${DART_PYTHONPATH}" "${Python3_EXECUTABLE}" -m pytest ${dartpy_test_files} -v
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     SOURCES ${dartpy_test_files} ${dartpy_test_utils}
     DEPENDS dartpy
@@ -53,8 +53,8 @@ function(dartpy_add_test test_name) # ARGN for source file
     set(source "${test_name}.py")
   endif()
   add_custom_target(${test_name}
-    COMMAND ${CMAKE_COMMAND} -E echo "Running pytest by: PYTHONPATH=${DART_PYTHON_BUILD_DIR} ${Python3_EXECUTABLE} ${source}"
-    COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${DART_PYTHON_BUILD_DIR} ${Python3_EXECUTABLE} ${source}
+    COMMAND ${CMAKE_COMMAND} -E echo "Running pytest by: PYTHONPATH=${DART_PYTHONPATH} ${Python3_EXECUTABLE} ${source}"
+    COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${DART_PYTHONPATH}" ${Python3_EXECUTABLE} ${source}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     SOURCES ${source}
     DEPENDS dartpy

python/tutorials/CMakeLists.txt

@@ -10,8 +10,8 @@ function(dartpy_add_tutorial tutorial_name) # ARGN for source file
     set(source "${tutorial_name}.py")
   endif()
   add_custom_target(${tutorial_name}
-    COMMAND ${CMAKE_COMMAND} -E echo "Running pytest by: PYTHONPATH=${DART_PYTHON_BUILD_DIR} ${Python3_EXECUTABLE} ${source}"
-    COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${DART_PYTHON_BUILD_DIR} ${Python3_EXECUTABLE} ${source}
+    COMMAND ${CMAKE_COMMAND} -E echo "Running pytest by: PYTHONPATH=${DART_PYTHONPATH} ${Python3_EXECUTABLE} ${source}"
+    COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${DART_PYTHONPATH}" ${Python3_EXECUTABLE} ${source}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     SOURCES ${source}
   )