Commit ea4ce6c4 authored by T.J. Corona's avatar T.J. Corona

Fix some tests to work on windows.

parent ece16a34
......@@ -424,6 +424,8 @@ if(SMTK_ENABLE_PYTHON_WRAPPING)
# Add the path to the build tree's compiled modules.
list(APPEND smtk_pythonpaths
"${CMAKE_BINARY_DIR}${envsep}${CMAKE_BINARY_DIR}/lib")
list(APPEND smtk_libpaths
"${CMAKE_BINARY_DIR}/lib")
if (CMAKE_RUNTIME_OUTPUT_DIRECTORY)
list(APPEND smtk_libpaths
"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
......
......@@ -114,10 +114,9 @@ void vtkModelMultiBlockSource::SetModelManager(const char* pointerAsString)
}
else
{
int base = 10;
int base = 16;
if (pointerAsString[0] == '0' && pointerAsString[1] == 'x')
{
base = 16;
pointerAsString += 2;
}
char* endPtr;
......
......@@ -250,7 +250,7 @@ PySharedPtrClass< smtk::model::Manager > pybind11_init_smtk_model_Manager(py::mo
.def("useOrShellIncludesShells", &smtk::model::Manager::useOrShellIncludesShells, py::arg("cellUseOrShell"))
.def("pointerAsString", [](smtk::model::Manager &m){
std::ostringstream result;
result << &m;
result << std::hex << &m;
return result.str();
})
;
......
Markdown is supported
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