diff --git a/smtk/CMakeLists.txt b/smtk/CMakeLists.txt index 5c17004cd3f63d5799e959e9046feb816b88e77b..73d309994b14564c848201e060f6befd374ec414 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. diff --git a/smtk/extension/paraview/appcomponents/pqSMTKAttributePanel.cxx b/smtk/extension/paraview/appcomponents/pqSMTKAttributePanel.cxx index 1bd88605fe41afc1bc14f43ebd15d19c2a07bf11..e304dd7cdab2dad0d5054e1e8745845c7c9004b4 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 = diff --git a/smtk/extension/vtk/io/CMakeLists.txt b/smtk/extension/vtk/io/CMakeLists.txt index 7c806fab3061dd948653d7dd5abaf113dedb3a8d..65acf3ecf24ea8d277ff494bc22b474962327cfd 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) diff --git a/smtk/extension/vtk/reader/vtk.module b/smtk/extension/vtk/reader/vtk.module index d1c633d2b0c59a549d357f98e52aaf9bd8d9f7d9..7399998a7892504c8b1f8b2cdc1c0a93b0cb4ef2 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