Commit 4a8c7a64 authored by Jacob Becker's avatar Jacob Becker Committed by Kitware Robot
Browse files

Merge topic 'fix_python_tests_on_windows'

a4d58290 fix test for windows
parents d8949fa2 a4d58290
...@@ -10,6 +10,8 @@ if( PYTHONINTERP_FOUND ) ...@@ -10,6 +10,8 @@ if( PYTHONINTERP_FOUND )
set(SIBOKEN_SMTK_PYTHON "") set(SIBOKEN_SMTK_PYTHON "")
if(UNIX) if(UNIX)
set(SIBOKEN_SMTK_PYTHON "${CMAKE_BINARY_DIR}:${SHIBOKEN_LIBRARY_PATH}") set(SIBOKEN_SMTK_PYTHON "${CMAKE_BINARY_DIR}:${SHIBOKEN_LIBRARY_PATH}")
else() #windows
set(SIBOKEN_SMTK_PYTHON "${CMAKE_BINARY_DIR};${SHIBOKEN_LIBRARY_PATH}")
endif() endif()
message("${LIB_ENV_VAR} PYTHONPATH=${SIBOKEN_SMTK_PYTHON}") message("${LIB_ENV_VAR} PYTHONPATH=${SIBOKEN_SMTK_PYTHON}")
message("${SHIBOKEN_LIBRARY_PATH}") message("${SHIBOKEN_LIBRARY_PATH}")
......
...@@ -14,6 +14,8 @@ if( PYTHONINTERP_FOUND ) ...@@ -14,6 +14,8 @@ if( PYTHONINTERP_FOUND )
set(SHIBOKEN_SMTK_PYTHON "") set(SHIBOKEN_SMTK_PYTHON "")
if(UNIX) if(UNIX)
set(SHIBOKEN_SMTK_PYTHON "${CMAKE_BINARY_DIR}:${SHIBOKEN_LIBRARY_PATH}") set(SHIBOKEN_SMTK_PYTHON "${CMAKE_BINARY_DIR}:${SHIBOKEN_LIBRARY_PATH}")
else() #windows
set(SIBOKEN_SMTK_PYTHON "${CMAKE_BINARY_DIR};${SHIBOKEN_LIBRARY_PATH}")
endif() endif()
foreach (test ${smtkModelPythonTests}) foreach (test ${smtkModelPythonTests})
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment