From b93bee283d6d1477e991645bd2b2895941cfacea Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Tue, 5 Nov 2019 16:36:04 -0500
Subject: [PATCH 1/4] vtk/io: avoid clobbering PROJECT_NAME
---
smtk/extension/vtk/io/CMakeLists.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/smtk/extension/vtk/io/CMakeLists.txt b/smtk/extension/vtk/io/CMakeLists.txt
index 7c806fab30..65acf3ecf2 100644
--- a/smtk/extension/vtk/io/CMakeLists.txt
+++ b/smtk/extension/vtk/io/CMakeLists.txt
@@ -84,8 +84,10 @@ target_include_directories(smtkIOVTK
smtk_public_headers(smtkIOVTK ${headers})
# add to the VTK module export set
+set(PROJECT_NAME_save "${PROJECT_NAME}")
set(PROJECT_NAME SMTKVTKModules)
smtk_install_library(smtkIOVTK)
+set(PROJECT_NAME "${PROJECT_NAME_save}")
if (SMTK_ENABLE_PYTHON_WRAPPING)
add_subdirectory(pybind11)
--
GitLab
From ead25f6731829cecbcfbde0a24d33deba7080d8f Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Wed, 6 Nov 2019 07:24:48 -0500
Subject: [PATCH 2/4] vtkSMTKReaderExt: handle remus support better
The whole module doesn't depend on Remus. It really should be split into
a Remus and not-Remus modules, but that can be deferred until the larger
SMTK split.
---
smtk/extension/vtk/reader/vtk.module | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/smtk/extension/vtk/reader/vtk.module b/smtk/extension/vtk/reader/vtk.module
index d1c633d2b0..7399998a78 100644
--- a/smtk/extension/vtk/reader/vtk.module
+++ b/smtk/extension/vtk/reader/vtk.module
@@ -1,7 +1,5 @@
NAME
vtkSMTKReaderExt
-CONDITION
- SMTK_ENABLE_REMUS_SUPPORT
DEPENDS
VTK::CommonCore
VTK::CommonDataModel
@@ -20,4 +18,5 @@ PRIVATE_DEPENDS
VTK::IOXML
VTK::InfovisLayout
VTK::vtksys
+OPTIONAL_DEPENDS
vtkSMTKMeshingExt
--
GitLab
From 54616e608629dc9521bc301ac71cf3bc5857070a Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Wed, 6 Nov 2019 07:29:25 -0500
Subject: [PATCH 3/4] smtkCore: let uuid do its autolinking
Otherwise the link libraries are incorrect on Windows with 1.70 and
above.
---
smtk/CMakeLists.txt | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/smtk/CMakeLists.txt b/smtk/CMakeLists.txt
index 5c17004cd3..73d309994b 100644
--- a/smtk/CMakeLists.txt
+++ b/smtk/CMakeLists.txt
@@ -113,6 +113,15 @@ target_link_libraries(smtkCore
LINK_PUBLIC ${smtkCore_public_link_libraries}
LINK_PRIVATE ${smtkCore_private_link_libraries})
+if (WIN32)
+ # Boost 1.70 and above have CMake configuration provided by upstream. Usage
+ # requirements are not quite resolved yet.
+ # https://github.com/boostorg/boost_install/issues/18
+ target_compile_definitions(smtkCore
+ PRIVATE
+ BOOST_UUID_FORCE_AUTO_LINK)
+endif ()
+
smtk_export_header(smtkCore CoreExports.h)
if (NOT BUILD_SHARED_LIBS AND SMTK_ENABLE_PYTHON_WRAPPING)
# Set position-independent flag when other project libs are shared.
--
GitLab
From 07280a54eed227e40e50bb8a2f181bb8b876210b Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Wed, 6 Nov 2019 08:22:32 -0500
Subject: [PATCH 4/4] pqSMTKAttributePanel: remove usage of
vtkSMGlobalPropertiesProxy class
ParaView removed this class.
---
.../paraview/appcomponents/pqSMTKAttributePanel.cxx | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/smtk/extension/paraview/appcomponents/pqSMTKAttributePanel.cxx b/smtk/extension/paraview/appcomponents/pqSMTKAttributePanel.cxx
index 1bd88605fe..e304dd7cda 100644
--- a/smtk/extension/paraview/appcomponents/pqSMTKAttributePanel.cxx
+++ b/smtk/extension/paraview/appcomponents/pqSMTKAttributePanel.cxx
@@ -31,7 +31,6 @@
#include "pqCoreUtilities.h"
#include "pqPipelineSource.h"
-#include "vtkSMGlobalPropertiesProxy.h"
#include "vtkSMProperty.h"
#include "vtkSMPropertyHelper.h"
#include "vtkSMProxy.h"
@@ -150,9 +149,7 @@ bool pqSMTKAttributePanel::displayResource(const smtk::attribute::ResourcePtr& r
// Start watching the resource's associate PV server for user preference changes.
pqServer* server = pqActiveObjects::instance().activeServer();
vtkSMSessionProxyManager* pxm = server ? server->proxyManager() : nullptr;
- auto paletteProxy = pxm
- ? vtkSMGlobalPropertiesProxy::SafeDownCast(pxm->GetProxy("global_properties", "ColorPalette"))
- : nullptr;
+ auto paletteProxy = pxm ? pxm->GetProxy("settings", "ColorPalette") : nullptr;
auto defaultValueColorProp =
paletteProxy ? paletteProxy->GetProperty("SMTKDefaultValueBackground") : nullptr;
auto invalidValueColorProp =
--
GitLab