Преглед на файлове

Tweak logic specifying libraries to link against VisualizationVTKCore

Since vtkRenderingFreeTypeOpenGL2 does not exist and vtkRenderingFreeTypeOpenGL, the
suffix OpenGL is hardcoded. Also move the logic in the FontConfig block.

Worth noting that vtkRenderingFreeTypeOpenGL has been removed in
version > 6.2.0 (See kitware/VTK@4f7460a5)
Jean-Christophe Fillion-Robin преди 10 години
родител
ревизия
349d634369
променени са 1 файла, в които са добавени 4 реда и са изтрити 3 реда
  1. 4 3
      Libs/Visualization/VTK/Core/CMakeLists.txt

+ 4 - 3
Libs/Visualization/VTK/Core/CMakeLists.txt

@@ -73,9 +73,6 @@ if(${VTK_VERSION_MAJOR} GREATER 5)
     vtkRenderingAnnotation
     vtkRenderingAnnotation
     vtkRenderingCore
     vtkRenderingCore
     )
     )
-  if(TARGET vtkRenderingFreeType${VTK_RENDERING_BACKEND})
-    list(APPEND VTK_LIBRARIES vtkRenderingFreeType${VTK_RENDERING_BACKEND})
-  endif()
   if(TARGET vtkRendering${VTK_RENDERING_BACKEND})
   if(TARGET vtkRendering${VTK_RENDERING_BACKEND})
     list(APPEND VTK_LIBRARIES vtkRendering${VTK_RENDERING_BACKEND})
     list(APPEND VTK_LIBRARIES vtkRendering${VTK_RENDERING_BACKEND})
   endif()
   endif()
@@ -91,6 +88,10 @@ if(${VTK_VERSION_MAJOR} GREATER 5)
   if (TARGET vtkRenderingFreeTypeFontConfig AND UNIX AND NOT APPLE)
   if (TARGET vtkRenderingFreeTypeFontConfig AND UNIX AND NOT APPLE)
     find_package(FontConfig QUIET)
     find_package(FontConfig QUIET)
     if (FONTCONFIG_FOUND)
     if (FONTCONFIG_FOUND)
+      # With VTK > 6.2.0 (commit 4f7460a5), vtkRenderingFreeTypeOpenGL has been removed.
+      if(TARGET vtkRenderingFreeTypeOpenGL)
+        list(APPEND VTK_LIBRARIES vtkRenderingFreeTypeOpenGL)
+      endif()
       list(APPEND VTK_LIBRARIES
       list(APPEND VTK_LIBRARIES
         vtkRenderingFreeTypeFontConfig
         vtkRenderingFreeTypeFontConfig
         )
         )