Commit 2f287755 authored by John Tourtellott's avatar John Tourtellott Committed by Kitware Robot

Merge topic 'conda-fix'

f1fcae12 Define SMTK_SCRATCH_DIR independent of SMTK_DATA_DIR
38b65dbc Remove hard-coded pybind version in smtkConfig file
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: T.J. Corona's avatarT.J. Corona <tj.corona@kitware.com>
Merge-request: !1470
parents 304ee90f f1fcae12
......@@ -44,9 +44,9 @@ function(smtk_unit_tests)
${VTK_INCLUDE_DIRS}
)
target_compile_definitions(${test_prog} PRIVATE "SMTK_SCRATCH_DIR=\"${CMAKE_BINARY_DIR}/Testing/Temporary\"")
if(have_testing_data)
target_compile_definitions(${test_prog} PRIVATE "SMTK_DATA_DIR=\"${SMTK_DATA_DIR}\"")
target_compile_definitions(${test_prog} PRIVATE "SMTK_SCRATCH_DIR=\"${CMAKE_BINARY_DIR}/Testing/Temporary\"")
endif()
foreach (test ${SMTK_ut_SOURCES})
......
......@@ -75,7 +75,7 @@ else()
set(PYTHON_INCLUDE_DIR ${SMTK_PYTHON_INCLUDE_DIR})
endif ()
find_package(pybind11 2.3)
find_package(pybind11 @pybind11_VERSION@)
endif()
set(SMTK_PLUGINS @SMTK_PLUGINS@)
......
......@@ -414,6 +414,7 @@ if(SMTK_ENABLE_PYTHON_WRAPPING)
find_package(pybind11 REQUIRED)
else()
find_package(pybind11 2.3 REQUIRED)
set(pybind11_VERSION "2.3")
endif()
set(SMTK_PYBIND11_FLAGS " ")
......
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