Commit 7c00b44b authored by David Thompson's avatar David Thompson
Browse files

Customize modelbuilder into aeva.

parent 9b4be02c
<!--
This template is for tracking a release of CMB. Please replace the
This template is for tracking a release of aeva. Please replace the
following strings with the associated values:
- `VERSION`
......@@ -11,17 +11,17 @@ Please remove this comment.
# Preparatory steps
- Update CMB guides
- Assemble release notes into `doc/release/CMB-VERSION`.
- Update aeva guides
- Assemble release notes into `doc/release/aeva-VERSION`.
- [ ] Get positive review and merge.
# Update CMB
# Update aeva
Keep the relevant items for the kind of release this is.
If making a first release candidate from master, i.e., `vMAJOR.MINOR.0-RC1`:
- [ ] Update `master` branch for **cmb**
- [ ] Update `master` branch for **aeva**
```
git fetch origin
git checkout master
......@@ -32,14 +32,14 @@ git merge --ff-only origin/master
git checkout -b update-to-vVERSION
echo VERSION > version.txt
git commit -m 'Update version number to VERSION' version.txt
git tag -a -m 'CMB VERSION' vVERSION HEAD
git tag -a -m 'aeva VERSION' vVERSION HEAD
```
- Integrate changes to `master` branch
- [ ] Create a merge request targeting `master` (do *not* add `Backport: release`)
- [ ] Get positive review
- [ ] `Do: merge`
- Updating SMTK
- [ ] Start SMTK's Release Process cmb/smtk#SMTK_RELEASE_ISSUE
- [ ] Start SMTK's Release Process aeva/smtk#SMTK_RELEASE_ISSUE
- Integrate changes to `release` branch
- [ ] `git config -f .gitmodules submodule.thirdparty/smtk.branch release`
- [ ] `git commit -m 'release: follow SMTK's release branch' .gitmodules`
......@@ -47,13 +47,13 @@ git tag -a -m 'CMB VERSION' vVERSION HEAD
- [ ] Update kwrobot with the new `release` branch rules (@ben.boeckel)
# Update CMB-Superbuild
# Update aeva-superbuild
Keep the relevant items for the kind of release this is.
If making a first release candidate from master, i.e., `vMAJOR.MINOR.0-RC1`:
- [ ] Update `master` branch for **cmb/cmb-superbuild**
- [ ] Update `master` branch for **aeva/aeva-superbuild**
```
git fetch origin
git checkout master
......@@ -62,12 +62,12 @@ git merge --ff-only origin/master
- Update `CMakeLists.txt`
- [ ] `git checkout -b update-to-vVERSION`
- [ ] Update PARAVIEW_VERSION_DEFAULT to the release version (without RC*)
- [ ] Set CMB source selections in `CMakeLists.txt` and force explicit
- [ ] Set aeva source selections in `CMakeLists.txt` and force explicit
version in `CMakeLists.txt`:
```
# Force source selection setting here.
set(cmb_SOURCE_SELECTION "VERSION" CACHE STRING "Force version to VERSION" FORCE)
set(cmb_FROM_SOURCE_DIR OFF CACHE BOOL "Force source dir off" FORCE)
set(aeva_SOURCE_SELECTION "VERSION" CACHE STRING "Force version to VERSION" FORCE)
set(aeva_FROM_SOURCE_DIR OFF CACHE BOOL "Force source dir off" FORCE)
```
- Update `versions.cmake`
- [ ] Guide selections in `versions.cmake`
......@@ -87,7 +87,7 @@ git gitlab-push -f
- [ ] Remove WIP from merge request title
- [ ] Get positive review
- [ ] `Do: merge`
- [ ] `git tag -a -m 'cmb superbuild VERSION' vVERSION HEAD`
- [ ] `git tag -a -m 'aeva superbuild VERSION' vVERSION HEAD`
- Integrate changes to `release` branch
- [ ] `git push origin update-to-vVERSION:release vVERSION`
- [ ] Update kwrobot with the new `release` branch rules
......@@ -124,7 +124,7 @@ If making a non-RC release:
- [ ] Write and publish blog post with release notes.
- [ ] Post an announcement in the Announcements category on
[discourse.cmb.org](https://discourse.kitware.com/c/cmb/).
[discourse.kitware.com](https://discourse.kitware.com/c/aeva/).
/cc @ben.boeckel
/cc @bob.obara
......
<!--
This template is for tracking a release of CMB. Please replace the
This template is for tracking a release of aeva. Please replace the
following strings with the associated values:
- `VERSION`
......@@ -11,15 +11,15 @@ Please remove this comment.
# Preparatory steps
- Update CMB guides
- Assemble release notes into `doc/release/CMB-VERSION`.
- Update aeva guides
- Assemble release notes into `doc/release/aeva-VERSION`.
- [ ] Get positive review and merge.
# Update CMB
# Update aeva
If making a release from the `release` branch, e.g., `vMAJOR.MINOR.0-RC2 or above`:
- [ ] Update `release` branch for **cmb**
- [ ] Update `release` branch for **aeva**
```
git fetch origin
git checkout release
......@@ -30,7 +30,7 @@ git merge --ff-only origin/release
git checkout -b update-to-vVERSION
echo VERSION > version.txt
git commit -m 'Update version number to VERSION' version.txt
git tag -a -m 'CMB VERSION' vVERSION HEAD
git tag -a -m 'aeva VERSION' vVERSION HEAD
```
- Integrate changes to `master` branch
- [ ] Create a merge request targeting `master` (do *not* add `Backport: release`)
......@@ -40,23 +40,23 @@ git tag -a -m 'CMB VERSION' vVERSION HEAD
- [ ] `git push origin update-to-vVERSION:release vVERSION`
# Update CMB-Superbuild
# Update aeva-superbuild
If making a release from the `release` branch, e.g., `vMAJOR.MINOR.0-RC2 or above`:
- Update `release` branch for **cmb/cmb-superbuild**
- Update `release` branch for **aeva/aeva-superbuild**
```
git fetch origin
git checkout release
git merge --ff-only origin/release
```
- Update `CMakeLists.txt`
- [ ] Set CMB source selections in `CMakeLists.txt` and force explicit
- [ ] Set aeva source selections in `CMakeLists.txt` and force explicit
version in `CMakeLists.txt`:
```
# Force source selection setting here.
set(cmb_SOURCE_SELECTION "VERSION" CACHE STRING "Force version to VERSION" FORCE)
set(cmb_FROM_SOURCE_DIR OFF CACHE BOOL "Force source dir off" FORCE)
set(aeva_SOURCE_SELECTION "VERSION" CACHE STRING "Force version to VERSION" FORCE)
set(aeva_FROM_SOURCE_DIR OFF CACHE BOOL "Force source dir off" FORCE)
```
- Update `versions.cmake`
- [ ] Guide selections in `versions.cmake`
......@@ -104,7 +104,7 @@ updateMD5sum.sh vMAJOR.MINOR
- [ ] Write and publish blog post with release notes.
- [ ] Post an announcement in the Announcements category on
[discourse.cmb.org](https://discourse.kitware.com/c/cmb/).
[discourse.kitware.com](https://discourse.kitware.com/c/aeva/).
/cc @ben.boeckel
......
<!--
This template is for tracking a release of CMB. Please replace the
This template is for tracking a release of aeva. Please replace the
following strings with the associated values:
- `VERSION`
......@@ -11,15 +11,15 @@ Please remove this comment.
# Preparatory steps
- Update CMB guides
- Assemble release notes into `doc/release/CMB-VERSION`.
- Update aeva guides
- Assemble release notes into `doc/release/aeva-VERSION`.
- [ ] Get positive review and merge.
# Update CMB
# Update aeva
If making a release from the `release` branch, e.g., `vMAJOR.MINOR.0-RC2 or above`:
- [ ] Update `release` branch for **cmb**
- [ ] Update `release` branch for **aeva**
```
git fetch origin
git checkout release
......@@ -30,7 +30,7 @@ git merge --ff-only origin/release
git checkout -b update-to-vVERSION
echo VERSION > version.txt
git commit -m 'Update version number to VERSION' version.txt
git tag -a -m 'CMB VERSION' vVERSION HEAD
git tag -a -m 'aeva VERSION' vVERSION HEAD
```
- Integrate changes to `master` branch
- [ ] Create a merge request targeting `master` (do *not* add `Backport: release`)
......@@ -43,23 +43,23 @@ git tag -a -m 'CMB VERSION' vVERSION HEAD
- [ ] See `https://github.com/Kitware/paraview-docs/blob/gh-pages/versions.json`
# Update CMB-Superbuild
# Update aeva-superbuild
If making a release from the `release` branch, e.g., `vMAJOR.MINOR.0-RC2 or above`:
- Update `release` branch for **cmb/cmb-superbuild**
- Update `release` branch for **aeva/aeva-superbuild**
```
git fetch origin
git checkout release
git merge --ff-only origin/release
```
- Update `CMakeLists.txt`
- [ ] Set CMB source selections in `CMakeLists.txt` and force explicit
- [ ] Set aeva source selections in `CMakeLists.txt` and force explicit
version in `CMakeLists.txt`:
```
# Force source selection setting here.
set(cmb_SOURCE_SELECTION "VERSION" CACHE STRING "Force version to VERSION" FORCE)
set(cmb_FROM_SOURCE_DIR OFF CACHE BOOL "Force source dir off" FORCE)
set(aeva_SOURCE_SELECTION "VERSION" CACHE STRING "Force version to VERSION" FORCE)
set(aeva_FROM_SOURCE_DIR OFF CACHE BOOL "Force source dir off" FORCE)
```
- Update `versions.cmake`
- [ ] Guide selections in `versions.cmake`
......@@ -79,7 +79,7 @@ git gitlab-push -f
- [ ] Remove WIP from merge request title
- [ ] Get positive review
- [ ] `Do: merge`
- [ ] `git tag -a -m 'CMB superbuild VERSION' vVERSION HEAD`
- [ ] `git tag -a -m 'aeva superbuild VERSION' vVERSION HEAD`
- Integrate changes to `release` branch
- [ ] `git push origin update-to-vVERSION:release vVERSION`
......@@ -111,7 +111,7 @@ updateMD5sum.sh vMAJOR.MINOR
- [ ] Write and publish blog post with release notes.
- [ ] Post an announcement in the Announcements category on
[discourse.cmb.org](https://discourse.kitware.com/c/cmb/).
[discourse.kitware.com](https://discourse.kitware.com/c/aeva/).
- [ ] Update release notes
(https://www.paraview.org/Wiki/ParaView_Release_Notes)
- [ ] Move unclosed issues to next release milestone in GitLab
......
......@@ -12,49 +12,49 @@ if(NOT DEFINED CMAKE_CXX_STANDARD)
set(CMAKE_CXX_EXTENSIONS FALSE)
endif()
option(BUILD_SHARED_LIBS "Build CMB using shared libraries" ON)
option(BUILD_SHARED_LIBS "Build aeva using shared libraries" ON)
################################################################################
# CMB version number
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/CMBVersion.cmake)
# aeva version number
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/aevaVersion.cmake)
project(cmb VERSION ${cmb_version})
project(aeva VERSION ${aeva_version})
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
# CMB does not require SMTK to be built but if SMTK is included it provides
# aeva does not require SMTK to be built but if SMTK is included it provides
# the locations for ParaView and QT
find_package(smtk QUIET)
set(CMB_TEST_DATA_DIR "" CACHE PATH "Path to test data directory. For CMB this is usually the source smtk/data")
set(aeva_TEST_DATA_DIR "" CACHE PATH "Path to test data directory. For aeva this is usually the source smtk/data")
find_package(ParaView COMPONENTS vtkIOGDAL REQUIRED)
find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
include(CMBPreamble) # Determine architecture, set up build-output directories.
include(CMBTesting) # Add an option to enable testing and set up pointers to the test data.
include(CMBInstallRules) # Fetch CMB version from version.txt and set up install/output directories.
include(CMBCoverage) # Add options for performing code coverage tests.
include(aevaPreamble) # Determine architecture, set up build-output directories.
include(aevaTesting) # Add an option to enable testing and set up pointers to the test data.
include(aevaInstallRules) # Fetch aeva version from version.txt and set up install/output directories.
include(aevaCoverage) # Add options for performing code coverage tests.
# Do not report some warnings from generated code to the dashboard:
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/CTestCustom.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake")
set(cmb_plugin_paths
"${cmb_plugin_paths}"
set(aeva_plugin_paths
"${aeva_plugin_paths}"
"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
CACHE STRING "Semi-colon separated paths for testing plugins."
)
mark_as_advanced(cmb_plugin_paths)
mark_as_advanced(aeva_plugin_paths)
add_subdirectory(thirdparty)
add_subdirectory(plugins) # Plugins must be built before the app so .plugins file will be correct.
add_subdirectory(modelbuilder)
add_subdirectory(aeva)
option(cmb_enable_documentation "Include targets Sphinx-generated documentation" OFF)
if (cmb_enable_documentation)
option(aeva_enable_documentation "Include targets Sphinx-generated documentation" OFF)
if (aeva_enable_documentation)
find_package(Sphinx)
add_subdirectory(doc)
endif()
# Add rules to build packages
include(CMBPackaging)
include(aevaPackaging)
Contributing to CMB
Contributing to aeva
========================
This page documents at a very high level how to contribute to CMB.
This page documents at a very high level how to contribute to aeva.
Please check our [developer instructions][] for a more detailed guide to
developing and contributing to the project, and our [CMB Git README][]
developing and contributing to the project, and our [aeva Git README][]
for additional information.
The CMB development cycle is built upon the following components:
The aeva development cycle is built upon the following components:
1. [Issues][] identify any issues including bugs and feature requests. In
general, every code change should have an associated issue which identifies
......@@ -24,7 +24,7 @@ The CMB development cycle is built upon the following components:
Reporting Issues
================
If you have a bug report or a feature request for CMB, you can use the
If you have a bug report or a feature request for aeva, you can use the
[issues][] tracker to report a [new issue][].
To report an issue.
......@@ -79,7 +79,7 @@ For every issue, developers can assign:
1. `area:...` labels to indicate which area this issue relates to in terms of the software process e.g. `area:build`,
`area:doc`, etc.
2. `app:...` label to indicate which application is effected by this issue. An issue
may have multiple apps associated with it (or use `app:framework` to indicate this is a general issue effecting all CMB applications.
may have multiple apps associated with it (or use `app:framework` to indicate this is a general issue effecting all aeva applications.
3. `triage:...` labels to indicate issue triage status. `triage:confirmed` is added
when the issue has been confirmed. `triage:easy` is added for issues that are
easy to fix. `triage:feature` is added to issues that are new feature requests.
......@@ -93,23 +93,23 @@ For every issue, developers can assign:
Fixing Issues
=============
Typically, one addresses issues by writing code. To start contributing to CMB:
Typically, one addresses issues by writing code. To start contributing to aeva:
1. Register for an account on [our GitLab instance][GitLab Access] and select a user name.
2. [Fork CMB][] into your user's namespace on GitLab.
2. [Fork aeva][] into your user's namespace on GitLab.
3. Create a local clone of the main CMB repository. Optionally configure
3. Create a local clone of the main aeva repository. Optionally configure
Git to [use SSH instead of HTTPS][].
Then clone:
$ git clone --recursive https://gitlab.kitware.com/cmb/cmb.git CMB
$ cd CMB
$ git clone --recursive https://gitlab.kitware.com/aeva/aeva.git aeva
$ cd aeva
The main repository will be configured as your `origin` remote.
For more information see: [Setup][] and [download instructions][]
4. Run the [developer setup script][] to prepare your CMB work
4. Run the [developer setup script][] to prepare your aeva work
tree and create Git command aliases used below:
$ ./util/SetupForDevelopment.sh
......@@ -118,7 +118,7 @@ Typically, one addresses issues by writing code. To start contributing to CMB:
For more information see: [Setup][]
5. [Build CMB] and run it.
5. [Build aeva] and run it.
6. Edit files and create commits (repeat as needed):
......@@ -160,29 +160,29 @@ Typically, one addresses issues by writing code. To start contributing to CMB:
the customer with any details necessary to test the fix.
Our [wiki][] is used to document features, flesh out designs and host other
documentation. We have several [mailing lists][] to coordinate development and
documentation. We have a [discourse site][] to coordinate development and
to provide support.
[CMB Git README]: doc/dev/README.md
[aeva Git README]: doc/dev/README.md
[developer instructions]: doc/dev/develop.md
[GitLab Access]: https://gitlab.kitware.com/users/sign_in
[Fork CMB]: https://gitlab.kitware.com/cmb/cmb/forks/new
[Fork aeva]: https://gitlab.kitware.com/aeva/aeva/forks/new
[use SSH instead of HTTPS]: doc/dev/download.md#use-ssh-instead-of-https
[download instructions]: doc/dev/download.md#clone
[developer setup script]: Utilities/SetupForDevelopment.sh
[Setup]: doc/dev/develop.md#Setup
[Build CMB]: doc/dev/build.md
[Build aeva]: doc/dev/build.md
[Create a Topic]: doc/dev/develop.md#create-a-topic
[Share a Topic]: doc/dev/develop.md#share-a-topic
[Create a Merge Request]: doc/dev/develop.md#create-a-merge-request
[Review a Merge Request]: doc/dev/develop.md#review-a-merge-request
[review]: doc/dev/develop.md#review-a-merge-request
[Issues]: https://gitlab.kitware.com/cmb/cmb/issues
[Merge Requests]: https://gitlab.kitware.com/cmb/cmb/merge_requests
[Labels]: https://gitlab.kitware.com/cmb/cmb/labels
[Milestones]: https://gitlab.kitware.com/cmb/cmb/milestones
[Wiki]: https://gitlab.kitware.com/cmb/cmb/wikis/pages
[Mailing Lists]: http://www.computationalmodelbuilder.org/mailinglist/
[Issues]: https://gitlab.kitware.com/aeva/aeva/issues
[Merge Requests]: https://gitlab.kitware.com/aeva/aeva/merge_requests
[Labels]: https://gitlab.kitware.com/aeva/aeva/labels
[Milestones]: https://gitlab.kitware.com/aeva/aeva/milestones
[Wiki]: https://gitlab.kitware.com/aeva/aeva/wikis/pages
[discourse site]: http://discourse.kitware.com/c/aeva
[Gitlab Markdown]: https://gitlab.kitware.com/help/user/markdown.md
[new issue]: https://gitlab.kitware.com/cmb/cmb/issues/new
[new issue]: https://gitlab.kitware.com/aeva/aeva/issues/new
[Labels Glossary]: doc/dev/labels.md
......@@ -9,5 +9,5 @@ set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
set(CTEST_DROP_METHOD "https")
set(CTEST_DROP_SITE "open.cdash.org")
set(CTEST_DROP_LOCATION "/submit.php?project=CMB")
set(CTEST_DROP_LOCATION "/submit.php?project=aeva")
set(CTEST_DROP_SITE_CDASH TRUE)
Computational Model Builder (CMB) License Version 1.0
Annotation Environment for Virtual Anatomy (aeva) License Version 1.0
========================================================================
Copyright (c) 2012 Kitware Inc. 28 Corporate Drive
Copyright (c) 2019 Kitware Inc. 28 Corporate Drive
Clifton Park, NY, 12065, USA.
Redistribution and use in source and binary forms, with or without
......
![CMB](./doc/userguide/figures/logo.png)
![Aeva](./doc/userguide/figures/logo.png)
Introduction
============
[Computational Model Builder (CMB)][CMB] is an open-source, multi-platform simulation workflow framework based on [ParaView][],
[Visualization Toolkit (VTK)][VTK] and [Qt][].
The [Annotation Environment for Virtual Anatomy (aeva)][] is
an open-source, multi-platform simulation workflow framework based on
[Computational Model Builder (CMB)][], [ParaView][],
the [Visualization Toolkit (VTK)][VTK] and [Qt][].
The project
has grown through collaborative efforts between [Kitware Inc.][Kitware],
has grown through collaborative efforts between
the [Cleveland Clinic][], [Kitware Inc.][Kitware],
and various other
government and commercial institutions, and acedemic partners.
[CMB]: https://www.ComputationalModelBuilder.org
[Annotation Environment for Virtual Anatomy (aeva)]: https://gitlab.kitware.com/aeva/aeva
[Computational Model Builder (CMB)]: https://www.ComputationalModelBuilder.org
[ParaView]: https://www.paraview.org
[QT]: https://www.qt.io
[VTK]: http://www.vtk.org
[Cleveland Clinic]: https://www.lerner.ccf.org/bme/
[Kitware]: https://www.kitware.com
Learning Resources
==================
* General information is available at the [CMB Homepage][].
* Documentation is available [online][Documentation].
* Community discussion takes place on the [CMB Mailing Lists][].
* Commercial [support][Kitware Support] and [training][Kitware Training]
are available from [Kitware][].
[CMB Homepage]: https://www.ComputationalModelBuilder.org
[Documentation]: https://www.computationalmodelbuilder.org/documentation/
[CMB Mailing Lists]: https://discourse.kitware.com/c/cmb
[Kitware]: https://www.kitware.com/
[Kitware Support]: https://www.kitware.com/products/support.html
[Kitware Training]: https://www.kitware.com/products/protraining.php
As aeva is developed, we will post more information on using and developing with it.
Reporting Bugs
==============
......@@ -43,14 +33,15 @@ If you have found a bug:
1. If you have a patch, please read the [CONTRIBUTING.md][] document.
2. Otherwise, please join the one of the [CMB Mailing Lists][] and ask
2. Otherwise, please join a discussion on our [discourse site][] and ask
about the expected and observed behaviors to determine if it is
really a bug.
3. Finally, if the issue is not resolved by the above steps, open
an entry in the [CMB Issue Tracker][].
an entry in the [aeva issue tracker][].
[CMB Issue Tracker]: https://gitlab.kitware.com/cmb/cmb/issues
[discourse site]: https://discourse.kitware.com/c/aeva
[aeva issue tracker]: https://gitlab.kitware.com/aeva/aeva/issues
Contributing
============
......@@ -62,7 +53,7 @@ See [CONTRIBUTING.md][] for instructions to contribute.
License
=======
CMB is distributed under the OSI-approved BSD 3-clause License.
Aeva is distributed under the OSI-approved BSD 3-clause License.
See [License.txt][] for details.
[License.txt]: LICENSE.txt
#------------------------------------------------------------------------------
# Declare source files for modelbuilder
# Declare source files for aeva
include(${PARAVIEW_USE_FILE})
# Headers that are not Qt subclasses
set(modelbuilder_HDRS
set(aeva_HDRS
mbPluginConfigLoader.h
mbMenuBuilder.h
mbObjectFactory.h
......@@ -14,14 +14,14 @@ set(modelbuilder_HDRS
)
# Headers that are Qt subclasses (and thus need moc run on them)
set(modelbuilder_MOC_HDRS
set(aeva_MOC_HDRS
mbMainWindow.h
mbTestEventPlayer.h
mbTestEventTranslator.h
)
# Implementation files.
set(modelbuilder_SRCS
set(aeva_SRCS
mbPluginConfigLoader.cxx
mbMainWindow.cxx
mbMenuBuilder.cxx
......@@ -54,13 +54,13 @@ endif()
# Qt UI files
set(modelbuilder_UI_SRCS
set(aeva_UI_SRCS
ui/mbMainWindow.ui
ui/mbFileMenu.ui
)
# Qt resource files
set(modelbuilder_RSRCS
set(aeva_RSRCS
resource/mbResource.qrc
)
......@@ -68,9 +68,9 @@ set(modelbuilder_RSRCS
# Add extra library containing custom code for the client.
include(ParaViewQt)
pv_find_package_qt(qt_targets REQUIRED QUIET QT5_COMPONENTS Widgets)
pv_qt_wrap_cpp(MOC_BUILT_SOURCES ${modelbuilder_MOC_HDRS})
pv_qt_wrap_ui(UI_BUILT_SOURCES ${modelbuilder_UI_SRCS})
pv_qt_add_resources(QT_BUILT_RESOURCES ${modelbuilder_RSRCS})
pv_qt_wrap_cpp(MOC_BUILT_SOURCES ${aeva_MOC_HDRS})
pv_qt_wrap_ui(UI_BUILT_SOURCES ${aeva_UI_SRCS})
pv_qt_add_resources(QT_BUILT_RESOURCES ${aeva_RSRCS})
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
......@@ -87,10 +87,10 @@ configure_file(
${CMAKE_CURRENT_BINARY_DIR}/mbTestData.h
)
set(modelbuilder_SOURCE_FILES
${modelbuilder_SRCS}
${modelbuilder_HDRS}
${modelbuilder_MOC_HDRS}
set(aeva_SOURCE_FILES
${aeva_SRCS}
${aeva_HDRS}
${aeva_MOC_HDRS}
${MOC_BUILT_SOURCES}
${UI_BUILT_SOURCES}
${QT_BUILT_RESOURCES}
......@@ -116,28 +116,28 @@ endforeach()
#if (PARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION)
# #------------------------------------------------------------------------------
# # Build Online-Help (aka Embedded Help) for the modelbuilder application.
# # Build Online-Help (aka Embedded Help) for the aeva application.
# # This is done after the above piece of code that sets the application_gui_xmls
# # variable. Documentation/CMakeLists.txt depends on it.
# add_subdirectory(Documentation)
#endif()
set(title "modelbuilder ${cmb_version} ${cmb_build_architecture}-bit")
set(title "aeva ${aeva_version} ${aeva_build_architecture}-bit")
#------------------------------------------------------------------------------
# Build the client
build_paraview_client(modelbuilder
APPLICATION_NAME "modelbuilder"
build_paraview_client(aeva
APPLICATION_NAME "aeva"