Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMB
CMB-Superbuild
Commits
8d2cf83c
Commit
8d2cf83c
authored
Dec 17, 2020
by
David Thompson
Browse files
Rename app to aevaCMB and install example data.
parent
9ee71054
Pipeline
#205973
waiting for manual action with stages
Changes
10
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
8d2cf83c
...
...
@@ -195,6 +195,7 @@ function (superbuild_find_projects var)
list
(
APPEND projects
aeva
aevasession
aevaexampledata
)
# For now it's a convenient option to control smtk documentation.
...
...
cmake/CMBSuperbuildMacros.cmake
View file @
8d2cf83c
...
...
@@ -16,6 +16,24 @@ macro (cmb_superbuild_add_pdf name outname)
endif
()
endmacro
()
macro
(
cmb_superbuild_add_example_data name outname
)
superbuild_add_project
(
"
${
name
}
"
DOWNLOAD_NO_EXTRACT 1
DEFAULT_ON
CONFIGURE_COMMAND
""
BUILD_COMMAND
""
INSTALL_COMMAND
"
${
CMAKE_COMMAND
}
"
-E copy_if_different
<DOWNLOADED_FILE>
"<INSTALL_DIR>/examples/
${
outname
}
"
)
if
(
${
name
}
_enabled
)
set
(
"
${
name
}
_data"
"
${
superbuild_install_location
}
/examples/
${
outname
}
"
)
endif
()
endmacro
()
set_property
(
GLOBAL
PROPERTY
cmb_superbuild_lfs_steps
...
...
projects/aeva.bundle.common.cmake
View file @
8d2cf83c
...
...
@@ -4,8 +4,8 @@ set(CPACK_PACKAGE_NAME "AEVA")
set
(
cmb_package_name
"aeva"
)
set
(
cmb_programs_to_install
aeva
)
aeva
CMB
)
set
(
cmb_install_paraview_server FALSE
)
set
(
cmb_install_paraview_python TRUE
)
...
...
projects/aeva.cmake
View file @
8d2cf83c
...
...
@@ -52,14 +52,13 @@ superbuild_add_project(aeva
DEBUGGABLE
INDEPENDENT_STEP_TARGETS
${
aeva_lfs_steps
}
download update
DEPENDS aevasession boost moab nlohmannjson occt python paraview
pybind11 qt5 smtk opencascadesession
pybind11 qt5 smtk opencascadesession
aevaexampledata
DEPENDS_OPTIONAL cumulus
${
aeva_extra_optional_dependencies
}
cxx11 libarchive hdf5 netcdf opencv
smtkprojectmanager
smtkresourcemanagerstate
python2 python3
remus zeromq vxl
cmbworkflows
cmbusersguide smtkusersguide
CMAKE_ARGS
${
aeva_extra_cmake_args
}
...
...
projects/aevaexampledata.cmake
0 → 100644
View file @
8d2cf83c
cmb_superbuild_add_example_data
(
aevaexampledata aeva-example.zip
)
projects/apple/aeva.bundle.cmake
View file @
8d2cf83c
set
(
cmb_doc_dir
"share/cmb/doc"
)
set
(
cmb_example_dir
"examples"
)
set
(
plugin_dir
"lib"
)
include
(
aeva.bundle.common
)
...
...
projects/cmb.bundle.common.cmake
View file @
8d2cf83c
...
...
@@ -274,9 +274,21 @@ function (cmb_install_pdf project filename)
endif
()
endfunction
()
function
(
cmb_install_data project filename
)
if
(
${
project
}
_enabled
)
install
(
FILES
"
${
superbuild_install_location
}
/examples/
${
filename
}
"
DESTINATION
"
${
cmb_example_dir
}
"
COMPONENT superbuild
)
endif
()
endfunction
()
function
(
cmb_install_extra_data
)
if
(
cmb_doc_dir
)
cmb_install_pdf
(
cmbusersguide
"CMBUsersGuide.pdf"
)
cmb_install_pdf
(
smtkusersguide
"SMTKUsersGuide.pdf"
)
endif
()
if
(
cmb_example_dir
)
cmb_install_data
(
aevaexampledata
"aeva-example.zip"
)
endif
()
endfunction
()
projects/unix/aeva.bundle.cmake
View file @
8d2cf83c
set
(
cmb_doc_dir
"share/cmb/doc"
)
set
(
cmb_example_dir
"share/examples"
)
set
(
plugin_dir
"lib"
)
include
(
aeva.bundle.common
)
...
...
projects/win32/aeva.bundle.cmake
View file @
8d2cf83c
set
(
cmb_doc_dir
"doc"
)
set
(
cmb_example_dir
"examples"
)
set
(
plugin_dir
"bin"
)
include
(
aeva.bundle.common
)
...
...
versions.cmake
View file @
8d2cf83c
...
...
@@ -23,10 +23,12 @@ superbuild_set_selectable_source(paraview
SELECT git PROMOTE DEFAULT
GIT_REPOSITORY
"https://gitlab.kitware.com/paraview/paraview.git"
# XXX: When updating, use the date from the commit as shown in `git log`
# and a short description of why the hash was updated.
# and a short description of why the hash was updated. DO NOT BLINDLY
# COPY THE COMMIT MESSAGE OF THE SHA. EXPLAIN WHY SMTK/CMB/AEVA NEED
# THE NEW PARAVIEW VERSION.
#
# What: master @ Mon Nov 23 15:29:33 2020 +0000
# Why: 5.9.0-rc1
update
# Why:
Multiple issues addressed in master after
5.9.0-rc1
GIT_TAG
"c3529d8e24fd95f2a3c697a4b7078301e1d8b1f7"
SELECT master CUSTOMIZABLE
GIT_REPOSITORY
"https://gitlab.kitware.com/paraview/paraview.git"
...
...
@@ -191,6 +193,9 @@ superbuild_set_revision(cmbusersguide
superbuild_set_revision
(
smtkusersguide
URL
"https://media.readthedocs.org/pdf/smtk/latest/smtk.pdf"
)
superbuild_set_revision
(
aevaexampledata
URL
"https://data.kitware.com/api/v1/file/5fd8e2be2fa25629b9929a43/download/aeva-example.zip"
)
# Use json from Wed Mar 20 21:03:30 2019 +0100
superbuild_set_revision
(
nlohmannjson
URL
"http://www.computationalmodelbuilder.org/files/dependencies/json-295732a81780378c62d1c095078b4634dac8ec28.tar.bz2"
...
...
David Thompson
@dcthomp
mentioned in commit
ce719d7c
·
Dec 22, 2020
mentioned in commit
ce719d7c
mentioned in commit ce719d7c1cc94f810bc4a63849ed80da558f009c
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment