Skip to content

Fix vtk CMake error #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FilipovicLado merged 2 commits into from
Jun 24, 2026
Merged

Fix vtk CMake error #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba1462b
fix vtk double import with ViennaPS
FilipovicLado Jun 24, 2026
21f2be0
fix: skip VTK discovery when targets already exist in scope
FilipovicLado Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
project(
ViennaLS
LANGUAGES CXX
VERSION 5.8.2)
VERSION 5.8.3)

# --------------------------------------------------------------------------------------------------------
# Library options
Expand Down Expand Up @@ -333,11 +333,21 @@ elseif(VIENNALS_USE_VTK)
OFF
CACHE BOOL "" FORCE)

if(NOT VIENNALS_PACKAGE_PYTHON)
set(_VIENNALS_REUSE_EXISTING_VTK FALSE)
if(TARGET VTK::CommonCore)
set(_VIENNALS_REUSE_EXISTING_VTK TRUE)
set(VTK_FOUND TRUE)
elseif(NOT VIENNALS_PACKAGE_PYTHON)
find_package(VTK 9.0.0 QUIET)
endif()

if(VTK_FOUND)
if(_VIENNALS_REUSE_EXISTING_VTK)
if(DEFINED VTK_VERSION)
message(STATUS "[ViennaLS] Reusing existing VTK targets ${VTK_VERSION}")
else()
message(STATUS "[ViennaLS] Reusing existing VTK targets")
endif()
elseif(VTK_FOUND)
message(STATUS "[ViennaLS] Using system VTK ${VTK_VERSION}")
else()
message(STATUS "[ViennaLS] Using bundled VTK v9.3.1")
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ We recommend using [CPM.cmake](https://github.com/cpm-cmake/CPM.cmake) to consum

* Installation with CPM
```cmake
CPMAddPackage("gh:viennatools/viennals@5.8.2")
CPMAddPackage("gh:viennatools/viennals@5.8.3")
```

* With a local installation
Expand Down
4 changes: 2 additions & 2 deletions include/viennals/lsVersion.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
namespace viennals {

// Version information generated by CMake
inline constexpr const char *version = "5.8.2";
inline constexpr const char *version = "5.8.3";
inline constexpr int versionMajor = 5;
inline constexpr int versionMinor = 8;
inline constexpr int versionPatch = 2;
inline constexpr int versionPatch = 3;

// Utility functions for version comparison
inline constexpr uint32_t versionAsInteger() {
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ requires = [
build-backend = "scikit_build_core.build"

[project]
version = "5.8.2"
version = "5.8.3"
name = "ViennaLS"
readme = "README.md"
license = {file = "LICENSE"}
Expand Down
4 changes: 2 additions & 2 deletions python/viennals/__init__.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ ILU0: _core.GpuPreconditioner # value = <GpuPreconditioner.ILU0: 1>
Jacobi: _core.GpuPreconditioner # value = <GpuPreconditioner.Jacobi: 0>
PROXY_DIM: int = 2
_SHARED_OXIDATION_TYPES: tuple = ('OxidationParameters', 'OxidationPresets', 'OxidationDeformationParameters', 'OxidationMaskParameters', 'OxidationCouplingParameters')
__version__: str = '5.8.2'
__version__: str = '5.8.3'
_name: str = 'OxidationCouplingParameters'
version: str = '5.8.2'
version: str = '5.8.3'
_C = _core
4 changes: 2 additions & 2 deletions python/viennals/_core.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,6 +1063,6 @@ Cpu: GpuMode # value = <GpuMode.Cpu: 0>
Gpu: GpuMode # value = <GpuMode.Gpu: 1>
ILU0: GpuPreconditioner # value = <GpuPreconditioner.ILU0: 1>
Jacobi: GpuPreconditioner # value = <GpuPreconditioner.Jacobi: 0>
__version__: str = '5.8.2'
version: str = '5.8.2'
__version__: str = '5.8.3'
version: str = '5.8.3'
IntegrationSchemeEnum = SpatialSchemeEnum
Loading