Commit c2d7f36f authored by Ryan Krattiger's avatar Ryan Krattiger
Browse files

Removed old project manager from superbuild

parent 0dd159f2
Pipeline #227106 waiting for manual action with stages
...@@ -4,7 +4,6 @@ set(SUPERBUILD_PACKAGE_MODE "<none>" CACHE STRING "") ...@@ -4,7 +4,6 @@ set(SUPERBUILD_PACKAGE_MODE "<none>" CACHE STRING "")
# matplotlib is not necessary, but this is as good a place as any to test it # matplotlib is not necessary, but this is as good a place as any to test it
set(ENABLE_matplotlib "ON" CACHE BOOL "") set(ENABLE_matplotlib "ON" CACHE BOOL "")
set(ENABLE_paraview "OFF" CACHE BOOL "") set(ENABLE_paraview "OFF" CACHE BOOL "")
set(ENABLE_smtkprojectmanager "OFF" CACHE BOOL "")
set(ENABLE_smtkresourcemanagerstate "OFF" CACHE BOOL "") set(ENABLE_smtkresourcemanagerstate "OFF" CACHE BOOL "")
set(ENABLE_vtkonly "ON" CACHE BOOL "") set(ENABLE_vtkonly "ON" CACHE BOOL "")
......
...@@ -9,5 +9,4 @@ endif () ...@@ -9,5 +9,4 @@ endif ()
set(ENABLE_paraview "ON" CACHE BOOL "") set(ENABLE_paraview "ON" CACHE BOOL "")
set(ENABLE_smtk "ON" CACHE BOOL "") set(ENABLE_smtk "ON" CACHE BOOL "")
set(ENABLE_smtkprojectmanager "OFF" CACHE BOOL "")
set(ENABLE_smtkresourcemanagerstate "OFF" CACHE BOOL "") set(ENABLE_smtkresourcemanagerstate "OFF" CACHE BOOL "")
...@@ -167,7 +167,6 @@ function (superbuild_find_projects var) ...@@ -167,7 +167,6 @@ function (superbuild_find_projects var)
if (NOT DEVELOPER_MODE_smtk) if (NOT DEVELOPER_MODE_smtk)
list(APPEND projects list(APPEND projects
smtkprojectmanager
smtkresourcemanagerstate) smtkresourcemanagerstate)
endif () endif ()
......
message(STATUS "Configuring modulebuild+truchas package") message(STATUS "Configuring modulebuild+truchas package")
set_property(GLOBAL PROPERTY truchas_PACKAGE_LABELS "TRUCHAS") set_property(GLOBAL PROPERTY truchas_PACKAGE_LABELS "TRUCHAS")
set_property(GLOBAL PROPERTY truchas_REQUIRED_PROJECTS "modelbuilder;smtktruchasextensions;cmb;smtkprojectmanager") set_property(GLOBAL PROPERTY truchas_REQUIRED_PROJECTS "modelbuilder;smtktruchasextensions;cmb;smtk")
set_property(GLOBAL PROPERTY truchas_EXCLUDE_PROJECTS "") set_property(GLOBAL PROPERTY truchas_EXCLUDE_PROJECTS "")
include(SuperbuildVersionMacros) include(SuperbuildVersionMacros)
superbuild_set_version_variables(smtktruchasextensions "1.0.0" "smtktruchasextensions-version.cmake" "version.txt") superbuild_set_version_variables(smtktruchasextensions "1.0.0" "smtktruchasextensions-version.cmake" "version.txt")
set(truchas_extra_projects set(truchas_extra_projects
smtkprojectmanager smtk
smtktruchasextensions smtktruchasextensions
) )
list(APPEND superbuild_extra_package_projects "${truchas_extra_projects}") list(APPEND superbuild_extra_package_projects "${truchas_extra_projects}")
......
...@@ -35,10 +35,6 @@ if (opencascadesession_enabled) ...@@ -35,10 +35,6 @@ if (opencascadesession_enabled)
list(APPEND aeva_plugins list(APPEND aeva_plugins
opencascade-session) opencascade-session)
endif () endif ()
if (smtkprojectmanager_enabled)
list(APPEND aeva_plugins
project-manager)
endif ()
if (smtkresourcemanagerstate_enabled) if (smtkresourcemanagerstate_enabled)
list(APPEND aeva_plugins list(APPEND aeva_plugins
read-and-write-resource-manager-state) read-and-write-resource-manager-state)
...@@ -61,7 +57,6 @@ superbuild_add_project(aeva ...@@ -61,7 +57,6 @@ superbuild_add_project(aeva
pybind11 qt5 smtk opencascadesession aevaexampledata pybind11 qt5 smtk opencascadesession aevaexampledata
DEPENDS_OPTIONAL cumulus ${aeva_extra_optional_dependencies} DEPENDS_OPTIONAL cumulus ${aeva_extra_optional_dependencies}
cxx11 libarchive hdf5 netcdf opencv cxx11 libarchive hdf5 netcdf opencv
smtkprojectmanager
smtkresourcemanagerstate smtkresourcemanagerstate
python2 python3 python2 python3
remus zeromq vxl remus zeromq vxl
......
...@@ -34,10 +34,6 @@ if (rggsession_enabled) ...@@ -34,10 +34,6 @@ if (rggsession_enabled)
list(APPEND cmb_plugins list(APPEND cmb_plugins
rgg-session) rgg-session)
endif () endif ()
if (smtkprojectmanager_enabled)
list(APPEND cmb_plugins
project-manager)
endif ()
if (smtkresourcemanagerstate_enabled) if (smtkresourcemanagerstate_enabled)
list(APPEND cmb_plugins list(APPEND cmb_plugins
read-and-write-resource-manager-state) read-and-write-resource-manager-state)
...@@ -67,7 +63,6 @@ superbuild_add_project(cmb ...@@ -67,7 +63,6 @@ superbuild_add_project(cmb
cmbworkflows cmbworkflows
cxx11 libarchive hdf5 netcdf opencv cxx11 libarchive hdf5 netcdf opencv
remus rggsession vxl zeromq remus rggsession vxl zeromq
smtkprojectmanager
smtkresourcemanagerstate smtkresourcemanagerstate
smtktruchasextensions smtktruchasextensions
python2 python3 python2 python3
......
set(smtkprojectmanager_rpaths)
if (APPLE AND USE_SYSTEM_qt5)
# On macOS, Qt5 packages use `@rpath` as their library ids. Add an rpath for
# it to the build.
list(APPEND smtkprojectmanager_rpaths
"${qt5_rpath}")
endif ()
string(REPLACE ";" "${_superbuild_list_separator}"
smtkprojectmanager_rpaths
"${smtkprojectmanager_rpaths}")
superbuild_add_project(smtkprojectmanager
DEBUGGABLE
DEFAULT_ON
DEPENDS boost cxx11 libarchive paraview qt5 smtk
DEPENDS_OPTIONAL python python2 python3
CMAKE_ARGS
-DCMAKE_INSTALL_LIBDIR:STRING=lib
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DCMAKE_INSTALL_RPATH:STRING=${smtkprojectmanager_rpaths}
-DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib)
superbuild_declare_paraview_xml_files(smtkprojectmanager
FILE_NAMES "smtk.projectmanager.xml"
DIRECTORY_HINTS "smtk-${smtk_version}")
...@@ -29,7 +29,7 @@ endif() ...@@ -29,7 +29,7 @@ endif()
superbuild_add_project(smtktruchasextensions superbuild_add_project(smtktruchasextensions
DEBUGGABLE DEBUGGABLE
DEFAULT_ON DEFAULT_ON
DEPENDS boost cxx11 paraview python qt5 smtk smtkprojectmanager DEPENDS boost cxx11 paraview python qt5 smtk
CMAKE_ARGS CMAKE_ARGS
${smtktruchasextensions_extra_cmake_args} ${smtktruchasextensions_extra_cmake_args}
-DBUILD_EXAMPLES:BOOL=OFF -DBUILD_EXAMPLES:BOOL=OFF
......
...@@ -228,11 +228,6 @@ superbuild_set_revision(smtkresourcemanagerstate ...@@ -228,11 +228,6 @@ superbuild_set_revision(smtkresourcemanagerstate
GIT_REPOSITORY "https://gitlab.kitware.com/cmb/plugins/read-and-write-resource-manager-state.git" GIT_REPOSITORY "https://gitlab.kitware.com/cmb/plugins/read-and-write-resource-manager-state.git"
GIT_TAG "origin/master") GIT_TAG "origin/master")
superbuild_set_revision(smtkprojectmanager
GIT_REPOSITORY "https://gitlab.kitware.com/cmb/plugins/project-manager.git"
GIT_TAG "origin/master"
GIT_SHALLOW "${SUPERBUILD_SHALLOW_CLONES}")
superbuild_set_revision(smtktruchasextensions superbuild_set_revision(smtktruchasextensions
GIT_REPOSITORY "https://gitlab.kitware.com/cmb/plugins/truchas-extensions.git" GIT_REPOSITORY "https://gitlab.kitware.com/cmb/plugins/truchas-extensions.git"
GIT_TAG "origin/master") GIT_TAG "origin/master")
......
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