Commit 50bf345a authored by T.J. Corona's avatar T.J. Corona

Remove SMTK as a submodule

parent 562ec4c3
[submodule "thirdparty/smtk"]
path = thirdparty/smtk
url = https://gitlab.kitware.com/cmb/smtk.git
......@@ -21,16 +21,7 @@ if (cmb_enable_testing)
set(cmb_data_dir "${CMAKE_CURRENT_SOURCE_DIR}/data")
endif ()
unset(smtk_data_dir CACHE)
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/smtk/data/smtk-data" sdata)
if (NOT sdata STREQUAL "\n")
message(WARNING
"Testing is enabled, but SMTK's data is not available. Use git-lfs in order "
"to obtain the testing data.")
set(smtk_data_dir)
else ()
set(smtk_data_dir "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/smtk/data")
endif ()
set(smtk_data_dir)
#add the first test which is for checking the copyright
add_test(NAME cmb-copyright-check
......
......@@ -115,7 +115,7 @@ set(title "modelbuilder ${cmb_version} ${cmb_build_architecture}-bit")
build_paraview_client(modelbuilder
APPLICATION_NAME "modelbuilder"
TITLE "${title}"
ORGANIZATION "modelbuilder"
ORGANIZATION "Kitware Inc."
VERSION_MAJOR ${cmb_version_major}
VERSION_MINOR ${cmb_version_minor}
VERSION_PATCH ${cmb_version_patch}
......@@ -133,19 +133,10 @@ build_paraview_client(modelbuilder
# SPLASH_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/resource/splash.png"
)
set(cumulus_libs)
if (ENABLE_Cumulus)
set(cumulus_libs smtkCumulusExt smtkPQCumulusJobsPlugin)
endif()
target_link_libraries(modelbuilder
LINK_PRIVATE
${qt_targets}
vtkPVServerManagerDefault
# TODO: we should not be linking against smtk directly.
smtkCore
smtkDefaultPlugins
${cumulus_libs}
)
target_include_directories(modelbuilder
PUBLIC
......@@ -169,7 +160,10 @@ if (PARAVIEW_ENABLE_PYTHON)
)
endif()
if(NOT BUILD_SHARED_LIBS)
# If ParaView was built statically, then vtkPVStaticPluginsInit was also
# created. We can branch off of the existence of this target to determine if we
# also need to support static plugins.
if(TARGET vtkPVStaticPluginsInit)
target_link_libraries(modelbuilder
LINK_PRIVATE
vtkPVStaticPluginsInit
......
......@@ -41,8 +41,6 @@
#include "pqRepresentationToolbar.h"
#include "pqSetName.h"
#include "thirdparty/smtk/smtk/plugin/InitializeDefaultPlugins.h"
// A feature that exposes ParaView's main window events (show, close, drag,
// etc.) was introduced just after the tagging of 5.6.0. These signals allow us
// to prompt the user to save modified resources prior to closing the
......@@ -158,9 +156,6 @@ mbMainWindow::mbMainWindow()
this->Internals = new pqInternals();
this->Internals->setupUi(this);
smtk::extension::paraview::initializeDefaultPlugins();
smtk::extension::paraview::loadDefaultPlugins();
// Allow multiple panels to dock side-by-side, which is
// handy for the attribute and resource-tree panels:
this->setDockNestingEnabled(true);
......
......@@ -27,6 +27,10 @@ set(xml_tests_with_baselines
set(test_images ${cmb_SOURCE_DIR}/data/baselines/modelbuilder)
if (cmb_data_dir)
find_package(smtk REQUIRED COMPONENTS smtkPQComponentsPlugin)
get_filename_component(smtk_plugin_path $<TARGET_FILE:smtkPQComponentsPlugin> DIRECTORY)
foreach(test ${xml_tests_with_baselines})
#get_image_threshold_arg(THRESHOLD_CMD ${test})
set(tname "${test}")
......@@ -37,7 +41,6 @@ if (cmb_data_dir)
--test-script=${CMAKE_CURRENT_SOURCE_DIR}/${test}.xml
--test-directory=${cmb_test_dir}
--test-baseline=${test_images}/${test}.png
--test-plugin-path=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
--exit
)
set(tlabels cmb modelbuilder ${${test}-labels})
......
option(cmb_use_system_smtk "Use a system SMTK install" OFF)
mark_as_advanced(cmb_use_system_smtk)
if (cmb_use_system_smtk)
find_package(SMTK REQUIRED)
else ()
# We include CMBInstallRules before we include the SMTK subdirectory. This
# way, we prevent SMTK's CMAKE_INSTALL_DIR from changing in between configure
# and install.
include(CMBInstallRules)
set(SMTK_ENABLE_TESTING ${BUILD_TESTING})
set(smtk_options
SMTK_ENABLE_PYTHON_WRAPPING
SMTK_ENABLE_QT_SUPPORT
SMTK_ENABLE_VTK_SUPPORT
SMTK_ENABLE_DISCRETE_SESSION
SMTK_ENABLE_EXODUS_SESSION
SMTK_ENABLE_REMUS_SUPPORT
SMTK_ENABLE_REMOTE_SESSION
SMTK_ENABLE_PARAVIEW_SUPPORT)
foreach (smtk_option IN LISTS smtk_options)
# These must be set as INTERNAL cache variables so that SMTK cannot
# override them other than with local variables. Setting a local variable
# is not sufficient due to ${unfortunate_historical_reasons} in CMake.
set("${smtk_option}" ON CACHE INTERNAL "Forced by CMB")
endforeach ()
add_subdirectory(smtk)
if (APPLE AND NOT SMTK_USE_SYSTEM_MOAB)
# If we are building MOAB, then we also package it with CMB. We therefore
# modify its INSTALL_NAME_DIR so it is in agreement with its eventual
# installation location.
set_target_properties(MOAB
PROPERTIES INSTALL_NAME_DIR "@executable_path/../Libraries")
endif ()
set(SMTK_DIR "${CMAKE_CURRENT_BINARY_DIR}/smtk"
CACHE INTERNAL "Path to SMTKConfig.cmake")
mark_as_advanced(SMTK_DIR)
endif ()
# CMB-specific thirdparty applications may go here
Subproject commit 05ef6585a492f362b99a94f0b821aacf284299f3
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