Skip to content

Commit

Permalink
Tweak logic specifying libraries to link against VisualizationVTKCore
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
jcfr committed Jul 22, 2015
1 parent 4deb7db commit 349d634
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Libs/Visualization/VTK/Core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ if(${VTK_VERSION_MAJOR} GREATER 5)
vtkRenderingAnnotation
vtkRenderingCore
)
if(TARGET vtkRenderingFreeType${VTK_RENDERING_BACKEND})
list(APPEND VTK_LIBRARIES vtkRenderingFreeType${VTK_RENDERING_BACKEND})
endif()
if(TARGET vtkRendering${VTK_RENDERING_BACKEND})
list(APPEND VTK_LIBRARIES vtkRendering${VTK_RENDERING_BACKEND})
endif()
Expand All @@ -91,6 +88,10 @@ if(${VTK_VERSION_MAJOR} GREATER 5)
if (TARGET vtkRenderingFreeTypeFontConfig AND UNIX AND NOT APPLE)
find_package(FontConfig QUIET)
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
vtkRenderingFreeTypeFontConfig
)
Expand Down

0 comments on commit 349d634

Please sign in to comment.