Commit 6e417ea1 authored by Ben Boeckel's avatar Ben Boeckel

qt5: plumb through to dependent projects

Packaging is not supported yet. OpenCV might need other options passed
to use Qt5 as well.
parent a10c0f43
......@@ -44,7 +44,9 @@ function (superbuild_find_projects var)
pythonrequests
pythonsetuptools
pythonsix
qt
qt4
qt5
remus
shiboken
smtk
......
......@@ -119,6 +119,7 @@ ignore_project_warnings(hdf5)
ignore_project_errors(hdf5)
ignore_project_warnings(python)
ignore_project_warnings(qt4)
ignore_project_warnings(qt5)
ignore_project_warnings(shiboken)
ignore_project_warnings(szip)
ignore_project_warnings(vxl)
......
superbuild_add_project(shiboken
DEPENDS qt4 python
CMAKE_ARGS
-DDISABLE_DOCSTRINGS:BOOL=ON)
......@@ -13,16 +13,17 @@ superbuild_add_project(cmb
DEVELOPER_MODE
DEBUGGABLE
DEFAULT_ON
DEPENDS boost remus vxl gdal qt4 python paraview
DEPENDS boost remus vxl gdal qt python paraview
cmbworkflows zeromq opencv
smtk # XXX(smtk): until the submodule works properly
DEPENDS_OPTIONAL moab smtk cumulus ${cmb_extra_optional_dependencies}
cxx11
cxx11 qt4 qt5
CMAKE_ARGS
${extra_cmake_args}
-DKML_DIR:PATH=<INSTALL_DIR>
-DGDAL_DIR:PATH=<INSTALL_DIR>
-DCMB_TEST_DATA_ROOT:PATH=${CMB_TEST_DATA_ROOT}
-DPARAVIEW_QT_VERSION:STRING=${qt_version}
#specify semi-colon separated paths for session plugins
-DCMB_TEST_PLUGIN_PATHS:STRING=<INSTALL_DIR>/${cmb_smtk_libdir}
......
superbuild_add_project(opencv
DEPENDS
python qt4 numpy
DEPENDS python qt numpy
DEPENDS_OPTIONAL qt4 qt5
CMAKE_ARGS
-DBUILD_PERF_TESTS:BOOL=OFF
-DBUILD_TESTS:BOOL=OFF
......@@ -12,6 +12,7 @@ superbuild_add_project(opencv
-DWITH_GTK:BOOL=OFF
-DWITH_FFMPEG:BOOL=OFF
-DWITH_VTK:BOOL=OFF
-DWITH_QT:STRING=${qt_version}
-DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib)
if (WIN32)
......
......@@ -59,16 +59,17 @@ superbuild_add_project(paraview
gdal
png
python
qt4
qt
zlib
netcdf
DEPENDS_OPTIONAL
cxx11 freetype hdf5 paraviewweb
cxx11 freetype hdf5 paraviewweb qt4 qt5
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=ON
-DBUILD_TESTING:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON
-DPARAVIEW_BUILD_QT_GUI:BOOL=${qt4_enabled}
-DPARAVIEW_BUILD_QT_GUI:BOOL=${qt_enabled}
-DPARAVIEW_QT_VERSION:STRING=${qt_version}
-DPARAVIEW_ENABLE_PYTHON:BOOL=${python_enabled}
-DPARAVIEW_ENABLE_WEB:BOOL=OFF
-DPARAVIEW_USE_MPI:BOOL=${mpi_enabled}
......
......@@ -6,13 +6,17 @@ endif ()
superbuild_add_project(shiboken
DEFAULT_ON
DEPENDS qt4 python
DEPENDS qt python
DEPENDS_OPTIONAL qt4 qt5
CMAKE_ARGS
-DSET_RPATH:BOOL=ON
-DBUILD_SHARED_LIBS:BOOL=ON
-DDISABLE_DOCSTRINGS:BOOL=ON
-DBUILD_TESTS:BOOL=OFF
-DSHIBOKEN_QT_VERSION:STRING=${qt_version}
${shiboken_extra_args})
superbuild_apply_patch(shiboken pythonpath
"Fix relative python path settings")
if (NOT APPLE)
superbuild_apply_patch(shiboken pythonpath
"Fix relative python path settings")
endif ()
......@@ -23,8 +23,9 @@ endif ()
superbuild_add_project(smtk
DEVELOPER_MODE
DEBUGGABLE
DEPENDS boost cxx11 gdal hdf5 paraview python qt4 remus zeromq
DEPENDS boost cxx11 gdal hdf5 paraview python qt remus zeromq
DEPENDS_OPTIONAL cgm cumulus moab netcdf opencv pybind11 shiboken
qt4 qt5
CMAKE_ARGS
${smtk_extra_cmake_args}
-DBUILD_SHARED_LIBS:BOOL=ON
......@@ -39,6 +40,7 @@ superbuild_add_project(smtk
-DSMTK_ENABLE_REMUS_SUPPORT:BOOL=ON
-DSMTK_ENABLE_PYTHON_WRAPPING:BOOL=${smtk_enable_python_wrapping}
-DSMTK_USE_PYBIND11:BOOL=${pybind11_enabled}
-DSMTK_QT_VERSION:STRING=${qt_version}
-DCMAKE_INSTALL_LIBDIR:STRING=${smtk_libdir}
-DSMTK_DATA_DIR:PATH=${CMB_TEST_DATA_ROOT}
......
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