Commit 4093001a authored by David Thompson's avatar David Thompson

Clean out deprecated options from the superbuild.

This removes all mention of shiboken and qt4.
It also removes the hydrology app bundle, as master should
no longer require separate apps for separate workflows.
parent d6675e4d
......@@ -71,7 +71,6 @@ function (superbuild_find_projects var)
qt4
qt5
remus
shiboken
smtk
smtkusersguide
szip
......@@ -123,18 +122,6 @@ function (superbuild_sanity_check)
message(FATAL_ERROR
"SMTK cannot use CMB's SMTK submodule without CMB being enabled and built by the superbuild.")
endif ()
if (shiboken_enabled AND pybind11_enabled)
message(FATAL_ERROR
"Only one python wrapping protocol should be enabled: pybind11, shiboken.")
endif ()
if (cmb_enabled AND NOT shiboken_enabled AND NOT pybind11_enabled)
message(FATAL_ERROR
"Exactly one python wrapping protocol must be enabled: pybind11, shiboken.")
endif ()
if (shiboken_enabled AND NOT ENABLE_qt4)
message(FATAL_ERROR
"Shiboken requires qt4; either use qt4 + shiboken or qt5 + pybind11.")
endif ()
endfunction ()
function (superbuild_add_packaging)
......@@ -153,11 +140,6 @@ function (superbuild_add_packaging)
TGZ)
endif ()
if (USE_SYSTEM_qt4)
list(APPEND superbuild_export_variables
QT_LIBRARY_DIR)
endif ()
if (qt5_built_by_superbuild)
set(Qt5_DIR "${superbuild_install_location}/lib/cmake/Qt5")
endif ()
......@@ -177,18 +159,10 @@ function (superbuild_add_packaging)
CMB_PACKAGE_FILE_NAME)
endif ()
option(cmb_ENABLE_HYDROLOGY_PACKAGE "Build full hydrology package" ON)
foreach (generator IN LISTS generators)
superbuild_add_extra_package_test(modelbuilder "${generator}"
LABELS "CMB"
TIMEOUT 6400)
if (cmb_ENABLE_HYDROLOGY_PACKAGE)
superbuild_add_extra_package_test(hydrology "${generator}"
LABELS "CMB"
TIMEOUT 6400)
endif()
endforeach ()
endfunction ()
......@@ -257,7 +231,6 @@ set(suppress_projects
oce
png
pybind11
shiboken
szip
vxl
zeromq
......
......@@ -35,10 +35,6 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
"build/.*/doc"
#Shiboken
"CMakeFiles/shiboken.dir"
"libapiextractor.a"
# Boost
"clang: warning: optimization flag '-finline-functions' is not supported"
"clang: warning: argument unused during compilation: '-finline-functions'"
......@@ -83,7 +79,6 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
"qmutex.h.* : warning C4512:"
"vil3d_dicom.obj : warning LNK4221:"
"install\\\\include"
"shiboken\\\\build"
"smtk\\\\src\\\\smtk\\\\ThirdParty"
"warning C4996: 'strcpy'"
"warning C4996: 'scanf'"
......@@ -124,9 +119,7 @@ ignore_project_warnings(gdal)
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)
ignore_project_warnings(zeromq)
......
include(hydrology.bundle.common)
set(cmb_package "CMB-Hydro ${cmb_version_major}.${cmb_version_minor}.${cmb_version_patch}")
set(cmb_doc_base_dir "Contents/doc")
include(cmb.bundle.apple)
......@@ -93,7 +93,6 @@ set(cmb_plugins_paraview)
set(cmb_python_modules
smtk
shiboken
paraview
cinema_python
pygments
......
......@@ -31,10 +31,10 @@ superbuild_add_project(cmb
DEBUGGABLE
DEFAULT_ON
INDEPENDENT_STEP_TARGETS ${cmb_lfs_steps} download update
DEPENDS boost moab remus vxl gdal nlohmannjson qt python paraview
cmbworkflows cmbusersguide smtkusersguide zeromq opencv
DEPENDS boost moab remus vxl gdal nlohmannjson opencv python paraview pybind11
qt qt5 zeromq cmbworkflows cmbusersguide smtkusersguide
DEPENDS_OPTIONAL smtk cgm cumulus ${cmb_extra_optional_dependencies}
cxx11 gdal hdf5 netcdf opencv pybind11 qt4 qt5 shiboken
cxx11 gdal hdf5 netcdf opencv
CMAKE_ARGS
${cmb_extra_cmake_args}
-DKML_DIR:PATH=<INSTALL_DIR>
......@@ -66,8 +66,8 @@ superbuild_add_project(cmb
-DSMTK_ENABLE_REMUS_SUPPORT:BOOL=ON
-DSMTK_ENABLE_PYTHON_WRAPPING:BOOL=${smtk_enable_python_wrapping}
-DSMTK_ENABLE_VXL_SUPPORT:BOOL=${vxl_enabled}
-DSMTK_USE_PYBIND11:BOOL=${pybind11_enabled}
-DSMTK_QT_VERSION:STRING=${qt_version}
-DSMTK_USE_PYBIND11:BOOL=ON
-DSMTK_QT_VERSION:STRING=5
-DSMTK_DATA_DIR:PATH=${CMB_TEST_DATA_ROOT}
-DSMTK_USE_SYSTEM_MOAB:BOOL=${moab_enabled}
......
# Set suffix to be used for generating archives. This ensures that the package
# files have decent names that we can directly upload to the website.
set(package_suffix_items)
if (qt4_enabled)
list(APPEND package_suffix_items
Qt4)
endif ()
if (qt5_enabled)
list(APPEND package_suffix_items
Qt5)
endif ()
if (APPLE)
list(APPEND package_suffix_items
"OSX${CMAKE_OSX_DEPLOYMENT_TARGET}")
......
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
"CMB Tools for Hydrologigal Simulations")
set(CPACK_PACKAGE_NAME "CMB")
set(cmb_package_name "CMB-Hydro")
set(cmb_programs_to_install
GrabCuts
modelbuilder
paraview
TemplateEditor)
set(cmb_install_paraview_server TRUE)
set(cmb_install_paraview_python TRUE)
include(cmb.bundle.common)
if (opencv_enabled)
list(APPEND cmb_python_modules
cv2)
endif ()
......@@ -62,16 +62,17 @@ superbuild_add_project(paraview
png
python
qt
qt5
zlib
netcdf
DEPENDS_OPTIONAL
cxx11 hdf5 paraviewweb qt4 qt5
cxx11 hdf5 paraviewweb
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=ON
-DBUILD_TESTING:BOOL=OFF
-DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON
-DPARAVIEW_BUILD_QT_GUI:BOOL=${qt_enabled}
-DPARAVIEW_QT_VERSION:STRING=${qt_version}
-DPARAVIEW_QT_VERSION:STRING=5
-DPARAVIEW_ENABLE_PYTHON:BOOL=${python_enabled}
-DPARAVIEW_ENABLE_WEB:BOOL=OFF
-DPARAVIEW_USE_MPI:BOOL=${mpi_enabled}
......
diff -U5 -Nru shiboken-110e45fa9d873afea4d7ae47da3fb678b1831a21/data/CMakeLists.txt shiboken-110e45fa9d873afea4d7ae47da3fb678b1831a21.pythonpath/data/CMakeLists.txt
--- shiboken-110e45fa9d873afea4d7ae47da3fb678b1831a21/data/CMakeLists.txt 2016-06-02 14:57:59.000000000 -0400
+++ shiboken-110e45fa9d873afea4d7ae47da3fb678b1831a21.pythonpath/data/CMakeLists.txt 2016-10-12 14:27:38.282098275 -0400
@@ -6,10 +6,16 @@
add_custom_target(data)
add_dependencies(data shiboken)
get_target_property(SHIBOKEN_GENERATOR shiboken OUTPUT_NAME)
+if (IS_ABSOLUTE "${PYTHON_SITE_PACKAGES}")
+ set(SBK_PYTHONPATH "${PYTHON_SITE_PACKAGES}")
+else ()
+ set(SBK_PYTHONPATH "${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PACKAGES}")
+endif ()
+
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig.cmake" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfig-spec.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig${PYTHON_SUFFIX}.cmake" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfigVersion.cmake.in"
diff -U5 -Nru shiboken-110e45fa9d873afea4d7ae47da3fb678b1831a21/data/ShibokenConfig-spec.cmake.in shiboken-110e45fa9d873afea4d7ae47da3fb678b1831a21.pythonpath/data/ShibokenConfig-spec.cmake.in
--- shiboken-110e45fa9d873afea4d7ae47da3fb678b1831a21/data/ShibokenConfig-spec.cmake.in 2016-06-02 14:57:59.000000000 -0400
+++ shiboken-110e45fa9d873afea4d7ae47da3fb678b1831a21.pythonpath/data/ShibokenConfig-spec.cmake.in 2016-10-12 14:27:44.668289167 -0400
@@ -13,11 +13,11 @@
elseif(WIN32)
SET(SHIBOKEN_LIBRARY "@CMAKE_INSTALL_PREFIX@/bin/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
else()
SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
endif()
-SET(SHIBOKEN_PYTHONPATH "@PYTHON_SITE_PACKAGES@")
+SET(SHIBOKEN_PYTHONPATH "@SBK_PYTHONPATH@")
SET(SHIBOKEN_PYTHON_INCLUDE_DIR "@SBK_PYTHON_INCLUDE_DIR@")
SET(SHIBOKEN_PYTHON_INCLUDE_DIR "@SBK_PYTHON_INCLUDE_DIR@")
SET(SHIBOKEN_PYTHON_INTERPRETER "@PYTHON_EXECUTABLE@")
SET(SHIBOKEN_PYTHON_LIBRARIES "@SBK_PYTHON_LIBRARIES@")
SET(SHIBOKEN_PYTHON_SUFFIX "@PYTHON_SUFFIX@")
set(shiboken_extra_args)
if (UNIX AND NOT APPLE)
list(APPEND shiboken_extra_args
-DPYTHON_SITE_PACKAGES:STRING=lib/python2.7/site-packages)
elseif (WIN32)
list(APPEND shiboken_extra_args
-DPYTHON_SITE_PACKAGES:STRING=bin/Lib/site-packages)
endif ()
superbuild_add_project(shiboken
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})
if (NOT APPLE)
superbuild_apply_patch(shiboken pythonpath
"Fix relative python path settings")
endif ()
......@@ -9,7 +9,7 @@ if (WIN32)
endif ()
set(smtk_enable_python_wrapping)
if (shiboken_enabled OR pybind11_enabled)
if (pybind11_enabled)
set(smtk_enable_python_wrapping ON)
endif ()
......@@ -43,7 +43,7 @@ superbuild_add_project(smtk
INDEPENDENT_STEP_TARGETS ${smtk_lfs_steps} download update
DEPENDS boost cxx11 eigen hdf5 moab netcdf nlohmannjson
DEPENDS_OPTIONAL cgm cumulus gdal netcdf opencv paraview pybind11 python
matplotlib remus shiboken qt qt4 qt5 vtkonly vxl
matplotlib remus qt qt5 vtkonly vxl
CMAKE_ARGS
${smtk_extra_cmake_args}
-DBUILD_SHARED_LIBS:BOOL=ON
......@@ -63,7 +63,7 @@ superbuild_add_project(smtk
# SMTK_USE_SYSTEM_MOAB should go away after CMB's SMTK is bumped to master:
-DSMTK_USE_SYSTEM_MOAB:BOOL=ON
-DPYBIND11_INSTALL:BOOL=${pybind11_enabled}
-DSMTK_QT_VERSION:STRING=${qt_version}
-DSMTK_QT_VERSION:STRING=5
-DSMTK_DATA_DIR:PATH=${CMB_TEST_DATA_ROOT}
# This should be off by default because vtkCmbMoabReader in discrete
......@@ -81,8 +81,6 @@ superbuild_add_project(smtk
# Cumulus bits
-DSMTK_ENABLE_CUMULUS_SUPPORT:BOOL=${cumulus_enabled}
-DSMTK_FIND_SHIBOKEN:STRING=
# Set CMAKE_INSTALL_LIBDIR to "lib" for all projects in the superbuild to
# override OS-specific libdirs that GNUInstallDirs.cmake would otherwise
# set.
......
set(cmb_doc_dir "share/cmb/doc")
include(hydrology.bundle.common)
include(cmb.bundle.unix)
# Install PDF guides.
cmb_install_extra_data()
......@@ -13,7 +13,7 @@ superbuild_add_project(vtkonly
zlib
netcdf
DEPENDS_OPTIONAL
cxx11 freetype python qt qt4 qt5
cxx11 freetype python qt qt5
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=ON
-DBUILD_TESTING:BOOL=OFF
......@@ -24,7 +24,7 @@ superbuild_add_project(vtkonly
-DVTK_USE_SYSTEM_NETCDF:BOOL=${netcdf_enabled}
-DVTK_RENDERING_BACKEND:STRING=OpenGL2
-DVTK_ENABLE_KITS:BOOL=ON
-DVTK_QT_VERSION:STRING=${qt_version}
-DVTK_QT_VERSION:STRING=5
#CMB needs geovis enabled to provide the gdal reader
-DModule_vtkGeovisCore:BOOL=ON
......
......@@ -15,11 +15,6 @@ set(pvpython_description "ParaView (Python shell)")
set(library_paths "lib")
if (USE_SYSTEM_qt4)
list(APPEND library_paths
"${QT_LIBRARY_DIR}")
endif ()
if (Qt5_DIR)
list(APPEND library_paths
"${Qt5_DIR}/../../../bin")
......
set(cmb_doc_dir "doc")
include(hydrology.bundle.common)
include(cmb.bundle.windows)
# Install PDF guides.
cmb_install_extra_data()
diff -NrU5 shiboken/CMakeLists.txt shiboken-patched/CMakeLists.txt
--- shiboken/CMakeLists.txt 2016-06-02 14:57:59.000000000 -0400
+++ shiboken-patched/CMakeLists.txt 2016-12-09 10:19:29.000000000 -0500
@@ -46,11 +46,11 @@
endif()
file(TO_CMAKE_PATH "${PYTHON_SITE_PACKAGES}" PYTHON_SITE_PACKAGES)
endif()
if(MSVC)
- set(CMAKE_CXX_FLAGS "/Zc:wchar_t- /GR /EHsc /DWIN32 /D_WINDOWS /D_SCL_SECURE_NO_WARNINGS")
+ set(CMAKE_CXX_FLAGS "/Zc:wchar_t- /GR /EHsc /DWIN32 /D_WINDOWS /D_SCL_SECURE_NO_WARNINGS /D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS")
else()
if(CMAKE_HOST_UNIX AND NOT CYGWIN)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fvisibility=hidden -Wno-strict-aliasing")
endif()
set(CMAKE_CXX_FLAGS_DEBUG "-g")
include("${CMAKE_CURRENT_LIST_DIR}/../shiboken.cmake")
superbuild_apply_patch(shiboken VC2015
"Add flag to ignore deprecation warnings for VC2015.")
......@@ -19,11 +19,6 @@ superbuild_set_revision(vtkonly
GIT_REPOSITORY "https://gitlab.kitware.com/vtk/vtk.git"
GIT_TAG origin/master)
superbuild_set_revision(shiboken
# https://github.com/OpenGeoscience/shiboken.git
URL "http://www.paraview.org/files/dependencies/shiboken-110e45fa9d873afea4d7ae47da3fb678b1831a21.tar.bz2"
URL_MD5 53e71b32964b5daf38b45e1679623e48)
superbuild_set_selectable_source(cmb
SELECT 5.0.0
GIT_REPOSITORY "https://gitlab.kitware.com/cmb/cmb.git"
......
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