Commit dac1d909 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'sb-fixes'

eb545ffa ci: use a Python2-compatible numpy for the python2 build
a9c3569a superbuild: bump for python2 compatibility
28bed403 cmake: include CTest at the top-level
28c8be70

 cmake: include the Cython project (for NumPy)
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Aron Helser's avatarAron Helser <aron.helser@kitware.com>
Merge-request: !720
parents 66693516 eb545ffa
Pipeline #210086 failed with stages
set(ENABLE_python2 ON CACHE BOOL "") set(ENABLE_python2 ON CACHE BOOL "")
set(ENABLE_python3 OFF CACHE BOOL "") set(ENABLE_python3 OFF CACHE BOOL "")
set(numpy_SOURCE_SELECTION python2 CACHE STRING "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_centos7_vtk.cmake") include("${CMAKE_CURRENT_LIST_DIR}/configure_centos7_vtk.cmake")
...@@ -147,6 +147,7 @@ function (superbuild_find_projects var) ...@@ -147,6 +147,7 @@ function (superbuild_find_projects var)
python2 python2
python3 python3
pythoncycler pythoncycler
pythoncython
pythondateutil pythondateutil
pythondiskcache pythondiskcache
pythongirderclient pythongirderclient
...@@ -399,3 +400,7 @@ list(APPEND superbuild_ctest_custom_files ...@@ -399,3 +400,7 @@ list(APPEND superbuild_ctest_custom_files
list(APPEND superbuild_project_roots list(APPEND superbuild_project_roots
"${CMAKE_CURRENT_LIST_DIR}/projects") "${CMAKE_CURRENT_LIST_DIR}/projects")
add_subdirectory(superbuild) add_subdirectory(superbuild)
if (BUILD_TESTING)
include(CTest)
endif ()
Subproject commit f22de335ed715a8a9203d7788d6e805312e98576 Subproject commit 1db8fb15d93750198a27ba076ad90e62144929ae
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