Commit 7d11fa7f authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'update-superbuild'

595abe0e unix: install the plugins file to the right place
d3392f31 opencv: style fixes
ae350ee9 unix: use the new installation macros
437f7cee superbuild: bump for new unix installation macros
510368b8 packages: refactor required python modules out
54b08e39 paths: update code for new build directories
7df542f5 superbuild: update for shorter paths
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard's avatarRobert Maynard <robert.maynard@kitware.com>
Merge-request: !176
parents 85f4e7dc 595abe0e
......@@ -18,7 +18,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
"/usr/bin/ranlib: warning for library: .*/libvimt_algo.a"
"src.*smtk.*ThirdParty"
"ld: warning: duplicate dylib"
"paraview/src/paraview-build"
"paraview/build"
"cmb/Source/Omicron"
"/usr/bin/ranlib: file: ../../../../lib/libtl_alloc.a.* has no symbols"
......@@ -27,7 +27,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
"has different visibility .* in .* and hidden in .*vtkInitializationHelper"
"has different visibility .* in .* and hidden in .*CMakeFiles/pqCore.dir/"
"src/.*-build/.*/doc"
"build/.*/doc"
#Shiboken
"CMakeFiles/shiboken.dir"
......@@ -38,7 +38,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
"clang: warning: argument unused during compilation: '-finline-functions'"
#Paraview
"paraview-build/.*/.*/Documentation"
"paraview/build/.*/.*/Documentation"
#vxl
"install/include/vxl"
......@@ -77,7 +77,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
"qmutex.h.* : warning C4512:"
"vil3d_dicom.obj : warning LNK4221:"
"install\\\\include"
"shiboken\\\\src\\\\shiboken-build"
"shiboken\\\\build"
"smtk\\\\src\\\\smtk\\\\ThirdParty"
"warning C4996: 'strcpy'"
"warning C4996: 'scanf'"
......@@ -110,7 +110,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
"ParaViewCore\\\\ServerImplementation\\\\Core\\\\vtkPVMessage.pb.h"
"paraview\\\\src\\\\paraview\\\\Plugins\\\\H5PartReader\\\\H5Part\\\\src\\\\H5Part.c"
"Applications\\\\ParaView\\\\paraview_main.cxx.* : warning C4996:"
"cmb-build\\\\source\\\\omicron"
"cmb\\\\build\\\\source\\\\omicron"
)
ignore_project_warnings(boost)
......
......@@ -87,26 +87,12 @@ foreach(program IN LISTS cmb_programs_to_install)
superbuild_apple_install_python(
"\${CMAKE_INSTALL_PREFIX}/${cmb_package}"
"${program}.app"
MODULES smtk
shiboken
cv2
numpy
${python_modules}
MODULES ${cmb_python_modules}
MODULE_DIRECTORIES
"${superbuild_install_location}/lib/python2.7/site-packages"
SEARCH_DIRECTORIES
"${superbuild_install_location}/lib")
superbuild_apple_install_python(
"\${CMAKE_INSTALL_PREFIX}/${cmb_package}"
"${program}.app"
MODULES paraview
pygments
six
vtk
MODULE_DIRECTORIES
"${superbuild_install_location}/Applications/paraview.app/Contents/Python"
SEARCH_DIRECTORIES
"${superbuild_install_location}/lib"
"${superbuild_install_location}/Applications/paraview.app/Contents/Libraries")
# Install the paraview.vtk module.
......
......@@ -84,3 +84,27 @@ set(cmb_plugins_ModelBuilder
${cmb_plugins_smtk})
set(cmb_plugins_paraview
CMB_Plugin)
set(cmb_python_modules
smtk
shiboken
paraview
pygments
six
vtk)
if (numpy_enabled)
list(APPEND cmb_python_modules
numpy)
endif ()
if (opencv_enabled)
list(APPEND cmb_python_modules
cv2)
endif ()
if (pythongirderclient_enabled)
list(APPEND cmb_python_modules
requests
girder_client)
endif ()
set(paraview_dir ${CMAKE_CURRENT_BINARY_DIR}/paraview/src/paraview-build)
set(paraview_dir ${CMAKE_CURRENT_BINARY_DIR}/paraview/build)
set(vtk_dir ${paraview_dir}/VTK)
if (__BUILDBOT_INSTALL_LOCATION)
......
superbuild_add_project(opencv
DEPENDS
python
qt4
opencvcontrib
numpy
CMAKE_ARGS
-DOPENCV_EXTRA_MODULES_PATH:PATH=${CMAKE_CURRENT_BINARY_DIR}/opencvcontrib/src/opencvcontrib/modules
-DBUILD_opencv_hdf:BOOL=OFF
-DBUILD_opencv_dnn:BOOL=OFF
-DWITH_CUDA:BOOL=OFF
-DWITH_VTK:BOOL=OFF
-DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib
)
DEPENDS
python qt4 opencvcontrib numpy
CMAKE_ARGS
-DOPENCV_EXTRA_MODULES_PATH:PATH=${CMAKE_CURRENT_BINARY_DIR}/opencvcontrib/src/modules
-DBUILD_opencv_hdf:BOOL=OFF
-DBUILD_opencv_dnn:BOOL=OFF
-DWITH_CUDA:BOOL=OFF
-DWITH_VTK:BOOL=OFF
-DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib)
superbuild_add_project(opencvcontrib
CONFIGURE_COMMAND
""
BUILD_COMMAND
""
INSTALL_COMMAND
""
)
CONFIGURE_COMMAND
""
BUILD_COMMAND
""
INSTALL_COMMAND
"")
set(paraview_dir ${CMAKE_CURRENT_BINARY_DIR}/paraview/src/paraview-build)
set(paraview_dir ${CMAKE_CURRENT_BINARY_DIR}/paraview/build)
if (__BUILDBOT_INSTALL_LOCATION)
set(paraview_dir <INSTALL_DIR>/lib/cmake/paraview-${paraview_version})
......
set(library_paths
"paraview-${paraview_version}"
"cmb-${cmb_version}")
"${superbuild_install_location}/lib"
"${superbuild_install_location}/lib/paraview-${paraview_version}"
"${superbuild_install_location}/lib/cmb-${cmb_version}")
if (QT_LIBRARY_DIR)
list(APPEND library_paths
......@@ -9,8 +10,9 @@ endif ()
set(plugins)
foreach (executable IN LISTS paraview_executables cmb_programs_to_install)
superbuild_unix_install_program("${executable}"
"${library_paths}")
superbuild_unix_install_program_fwd("${executable}"
"lib/paraview-${paraview_version};lib/cmb-${cmb_version}"
SEARCH_DIRECTORIES "${library_paths}")
list(APPEND plugins
${cmb_plugins_${executable}})
endforeach ()
......@@ -19,69 +21,40 @@ list(REMOVE_DUPLICATES plugins)
foreach (plugin IN LISTS plugins)
superbuild_unix_install_plugin("lib${plugin}.so"
"cmb-${cmb_version}"
";${library_paths}"
"cmb-${cmb_version}/plugins/")
"lib/cmb-${cmb_version}"
"lib;lib/cmb-${cmb_version}"
SEARCH_DIRECTORIES "${library_paths}"
LOCATION "lib/cmb-${cmb_version}/plugins/${plugin}/")
endforeach ()
set(python_modules)
if (pythongirderclient_enabled)
list(APPEND python_modules
requests
girder_client)
endif ()
superbuild_unix_install_python(
"${CMAKE_INSTALL_PREFIX}"
"cmb-${cmb_version}"
MODULES smtk
shiboken
paraview
pygments
six
vtk
numpy
cv2
${python_modules}
MODULE_DIRECTORIES
"${superbuild_install_location}/lib/python2.7/site-packages"
"${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES
${library_paths})
LIBDIR "lib/cmb-${cmb_version}"
MODULES ${cmb_python_modules}
MODULE_DIRECTORIES "${superbuild_install_location}/lib/python2.7/site-packages"
"${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES "${library_paths}")
superbuild_unix_install_python(
"${CMAKE_INSTALL_PREFIX}"
"cmb-${cmb_version}"
MODULES vtk
NAMESPACE paraview
MODULE_DIRECTORIES
"${superbuild_install_location}/lib/python2.7/site-packages"
"${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES
"paraview-${paraview_version}")
MODULE_DESTINATION "/site-packages/paraview"
LIBDIR "lib/cmb-${cmb_version}"
MODULES vtk
MODULE_DIRECTORIES "${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES "${library_paths}")
if (cmb_install_paraview_python)
superbuild_unix_install_python(
"${CMAKE_INSTALL_PREFIX}"
"paraview-${paraview_version}"
MODULES paraview
vtk
MODULE_DIRECTORIES
"${superbuild_install_location}/lib/python2.7/site-packages"
"${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES
"paraview-${paraview_version}")
LIBDIR "lib/paraview-${paraview_version}"
MODULES paraview vtk
MODULE_DIRECTORIES "${superbuild_install_location}/lib/python2.7/site-packages"
"${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES "${library_paths}")
superbuild_unix_install_python(
"${CMAKE_INSTALL_PREFIX}"
"paraview-${paraview_version}"
MODULES vtk
NAMESPACE paraview
MODULE_DIRECTORIES
"${superbuild_install_location}/lib/python2.7/site-packages"
"${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES
"paraview-${paraview_version}")
MODULE_DESTINATION "/site-packages/paraview"
LIBDIR "lib/paraview-${paraview_version}"
MODULES vtk
MODULE_DIRECTORIES "${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES "${library_paths}")
endif ()
if (pythonrequests_enabled)
......@@ -99,7 +72,7 @@ cmb_add_plugin("${plugins_file}" ${plugins})
install(
FILES "${plugins_file}"
DESTINATION "bin"
DESTINATION "lib/cmb-${cmb_version}"
COMPONENT superbuild)
install(
......
......@@ -43,24 +43,9 @@ foreach (plugin IN LISTS plugins)
"${library_paths}")
endforeach ()
set(python_modules)
if (pythongirderclient_enabled)
list(APPEND python_modules
requests
girder_client)
endif ()
superbuild_windows_install_python(
"${CMAKE_INSTALL_PREFIX}"
MODULES smtk
shiboken
paraview
pygments
six
vtk
cv2
numpy
${python_modules}
MODULES ${cmb_python_modules}
MODULE_DIRECTORIES
"${superbuild_install_location}/bin/Lib/site-packages"
"${superbuild_install_location}/lib/site-packages"
......
Subproject commit be03c023944fc48b382d27ef938906345d7353ef
Subproject commit e597c0b5e4ca28458154e23a97653b3815b5221f
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