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

Merge topic 'ci-macos-11-host-fixes'

89291818 cmb.bundle.unix: install libraries as modules
a80d8e85 cmake: add sqlite package to the list
f60ed903 aeva, cmb, smtk: use new ExternalProject keyword if possible
8ccac6fc

 superbuild: bump for Python3 macOS deployment fixes
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !717
parents 80df7742 89291818
Pipeline #208623 failed with stages
......@@ -177,6 +177,7 @@ function (superbuild_find_projects var)
libxml2
meshkit
pkgconf
sqlite
utillinux)
endif ()
......
......@@ -47,10 +47,16 @@ string(REPLACE ";" "${_superbuild_list_separator}"
aeva_plugins
"${aeva_plugins}")
if (POLICY CMP0114)
set(aeva_step_keyword STEP_TARGETS)
else ()
set(aeva_step_keyword INDEPENDENT_STEP_TARGETS)
endif ()
superbuild_add_project(aeva
DEVELOPER_MODE
DEBUGGABLE
INDEPENDENT_STEP_TARGETS ${aeva_lfs_steps} download update
${aeva_step_keyword} ${aeva_lfs_steps} download update
DEPENDS aevasession boost moab nlohmannjson occt python paraview
pybind11 qt5 smtk opencascadesession aevaexampledata
DEPENDS_OPTIONAL cumulus ${aeva_extra_optional_dependencies}
......
......@@ -46,11 +46,17 @@ string(REPLACE ";" "${_superbuild_list_separator}"
cmb_plugins
"${cmb_plugins}")
if (POLICY CMP0114)
set(cmb_step_keyword STEP_TARGETS)
else ()
set(cmb_step_keyword INDEPENDENT_STEP_TARGETS)
endif ()
superbuild_add_project(cmb
DEVELOPER_MODE
DEBUGGABLE
DEFAULT_ON
INDEPENDENT_STEP_TARGETS ${cmb_lfs_steps} download update
${cmb_step_keyword} ${cmb_lfs_steps} download update
DEPENDS boost moab nlohmannjson python paraview pybind11
qt5 smtk cmbworkflows cmbusersguide smtkusersguide
DEPENDS_OPTIONAL cumulus ${cmb_extra_optional_dependencies}
......
......@@ -33,13 +33,19 @@ endif ()
get_property(smtk_lfs_steps GLOBAL
PROPERTY cmb_superbuild_lfs_steps)
if (POLICY CMP0114)
set(smtk_step_keyword STEP_TARGETS)
else ()
set(smtk_step_keyword INDEPENDENT_STEP_TARGETS)
endif ()
#explicitly depend on gdal so we inherit the location of the GDAL library
#which FindGDAL.cmake fails to find, even when given GDAL_DIR.
superbuild_add_project(smtk
DEVELOPER_MODE
DEBUGGABLE
DEFAULT_ON
INDEPENDENT_STEP_TARGETS ${smtk_lfs_steps} download update
${smtk_step_keyword} ${smtk_lfs_steps} download update
DEPENDS boost cxx11 eigen hdf5 libarchive moab netcdf nlohmannjson pegtl
DEPENDS_OPTIONAL cumulus gdal netcdf occt paraview pybind11 python python2
python3 matplotlib remus qt5 vtkonly
......
......@@ -53,7 +53,7 @@ foreach (plugin_file IN LISTS all_plugin_files)
endforeach ()
foreach (library IN LISTS cmb_additional_libraries)
superbuild_unix_install_plugin("lib${plugin}.so"
superbuild_unix_install_module("lib${plugin}.so"
"lib"
"lib"
SEARCH_DIRECTORIES "${library_paths}"
......@@ -146,7 +146,7 @@ foreach (qt5_plugin_path IN LISTS qt5_plugin_paths)
get_filename_component(qt5_plugin_group "${qt5_plugin_path}" DIRECTORY)
get_filename_component(qt5_plugin_group "${qt5_plugin_group}" NAME)
superbuild_unix_install_plugin("${qt5_plugin_path}"
superbuild_unix_install_module("${qt5_plugin_path}"
"lib"
"plugins/${qt5_plugin_group}/"
LOADER_PATHS "${library_paths}"
......@@ -156,7 +156,7 @@ endforeach ()
if (meshkit_enabled)
foreach (meshkit_exe IN ITEMS coregen assygen)
superbuild_unix_install_plugin("${superbuild_install_location}/meshkit/bin/${meshkit_exe}"
superbuild_unix_install_module("${superbuild_install_location}/meshkit/bin/${meshkit_exe}"
"lib"
"bin"
SEARCH_DIRECTORIES "${library_paths}")
......
Subproject commit c81ce63f5cce8904fa513f5b0d015c128ee61f3d
Subproject commit d9827ec4efeec1cf0be41218494f0e809f3772a5
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