Commit 41a62bef authored by jcfr's avatar jcfr
Browse files

COMP: PythonQt is not any more a direct dependency of Slicer

CTK will download/configure/build PythonQt

git-svn-id: http://svn.slicer.org/Slicer4/trunk@13405 3bd1e089-480b-0410-8dfb-8563597acbee
parent 859e7667
...@@ -197,13 +197,15 @@ set(python_DEPENDENCIES) ...@@ -197,13 +197,15 @@ set(python_DEPENDENCIES)
if(Slicer3_USE_KWWIDGETS) if(Slicer3_USE_KWWIDGETS)
set(python_DEPENDENCIES tcl) set(python_DEPENDENCIES tcl)
endif() endif()
set(PythonQt_DEPENDENCIES python)
set(blas_DEPENDENCIES) set(blas_DEPENDENCIES)
set(lapack_DEPENDENCIES) set(lapack_DEPENDENCIES)
set(numpy_DEPENDENCIES blas lapack python) set(numpy_DEPENDENCIES blas lapack python)
set(scipy_DEPENDENCIES numpy) set(scipy_DEPENDENCIES numpy)
set(vtk_DEPENDENCIES) set(vtk_DEPENDENCIES)
set(CTK_DEPENDENCIES vtk) set(CTK_DEPENDENCIES vtk)
if(Slicer3_USE_PYTHONQT)
list(append CTK_DEPENDENCIES python)
endif()
set(KWWidgets_DEPENDENCIES vtk) set(KWWidgets_DEPENDENCIES vtk)
set(Insight_DEPENDENCIES) set(Insight_DEPENDENCIES)
set(BatchMake_DEPENDENCIES Insight) set(BatchMake_DEPENDENCIES Insight)
...@@ -241,11 +243,6 @@ include(External_VTK) ...@@ -241,11 +243,6 @@ include(External_VTK)
if(Slicer3_USE_QT) if(Slicer3_USE_QT)
include(External_CTK) include(External_CTK)
if(Slicer3_USE_PYTHONQT)
include(External_PythonQt)
endif(Slicer3_USE_PYTHONQT)
endif(Slicer3_USE_QT) endif(Slicer3_USE_QT)
if(Slicer3_USE_KWWIDGETS) if(Slicer3_USE_KWWIDGETS)
...@@ -292,10 +289,6 @@ if(Slicer3_USE_PYTHON) ...@@ -292,10 +289,6 @@ if(Slicer3_USE_PYTHON)
list(APPEND slicer_DEPENDENCIES python) list(APPEND slicer_DEPENDENCIES python)
endif(Slicer3_USE_PYTHON) endif(Slicer3_USE_PYTHON)
if (Slicer3_USE_PYTHONQT)
list(APPEND slicer_DEPENDENCIES PythonQt)
endif(Slicer3_USE_PYTHONQT)
set(slicer_KWWIDGETS_ARGS) set(slicer_KWWIDGETS_ARGS)
if(Slicer3_USE_KWWIDGETS) if(Slicer3_USE_KWWIDGETS)
set(slicer_KWWIDGETS_ARGS set(slicer_KWWIDGETS_ARGS
......
#-----------------------------------------------------------------------------
# PythonQT
#
set(proj PythonQt)
find_program(Slicer3_PATCH_EXECUTABLE patch
"C:/Program Files/GnuWin32/bin"
"C:/Program Files (x86)/GnuWin32/bin")
mark_as_advanced(Slicer3_PATCH_EXECUTABLE)
if (NOT Slicer3_PATCH_EXECUTABLE)
message(FATAL_ERROR "Building PythonQt requires a patch program. Please set Slicer3_PATCH_EXECUTABLE!")
endif()
set(pythonqt_src_dir "${CMAKE_CURRENT_BINARY_DIR}/${proj}")
set(pythonqt_patches_dir "${CMAKE_CURRENT_SOURCE_DIR}/../Utilities/Patches/PythonQt")
set(pythonqt_patch_script "${CMAKE_CURRENT_BINARY_DIR}/Slicer3-build/CMake/Slicer3PatchPythonQt.cmake")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../CMake/Slicer3PatchPythonQt.cmake.in ${pythonqt_patch_script} @ONLY)
ExternalProject_Add(${proj}
DEPENDS ${PythonQt_DEPENDENCIES}
SVN_REPOSITORY "https://pythonqt.svn.sourceforge.net/svnroot/pythonqt/trunk"
SOURCE_DIR PythonQt
PATCH_COMMAND ${CMAKE_COMMAND} -P ${pythonqt_patch_script}
CMAKE_GENERATOR ${gen}
CMAKE_ARGS
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
${vtk_PYTHON_ARGS}
INSTALL_COMMAND "")
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