Browse Source

Update to newer VTK

master
Trevor Irons 7 months ago
parent
commit
cfaf506daf
2 changed files with 8 additions and 5 deletions
  1. 7
    4
      CMake/SuperBuild.cmake
  2. 1
    1
      CMakeLists.txt

+ 7
- 4
CMake/SuperBuild.cmake View File

@@ -42,13 +42,16 @@ else()
42 42
 endif()
43 43
 
44 44
 if ( LEMMA_VTK9_SUPPORT )
45
+    if ( VTK_FOUND )
46
+        message(STATUS "VTK FOUND!")
47
+    endif()
45 48
     if ( NOT VTK_FOUND OR  VTK_VERSION VERSION_LESS "9.0.0" )
46
-        message( STATUS "VTK > 8.20.0 was found! Version found: " ${VTK_VERSION}, ${VTK_USE_FILE} )
47
-        message( STATUS "External build of VTK 8 has been added, this may take some time to build." )
49
+        #message( STATUS "VTK > 8.20.0 was found! Version found: " ${VTK_VERSION}, ${VTK_USE_FILE} )
50
+        message( STATUS "External build of VTK 9 has been added, this may take some time to build." )
48 51
         ExternalProject_Add(VTK9
49 52
         GIT_REPOSITORY "https://gitlab.kitware.com/vtk/vtk.git"
50
-        GIT_TAG  "v9.0.1"
51
-        PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/vtk8
53
+        GIT_TAG  "v9.3.0"
54
+        PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/vtk9
52 55
         CMAKE_ARGS
53 56
             -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
54 57
             -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} /

+ 1
- 1
CMakeLists.txt View File

@@ -1,4 +1,4 @@
1
-cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
1
+cmake_minimum_required(VERSION 3.10.0 FATAL_ERROR)
2 2
 
3 3
 # add this options before PROJECT keyword
4 4
 set(CMAKE_DISABLE_SOURCE_CHANGES ON)

Loading…
Cancel
Save