From 349d634369e57b9fb7fe80d9291940ad88f7c634 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Wed, 22 Jul 2015 15:25:41 -0400 Subject: [PATCH] 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) --- Libs/Visualization/VTK/Core/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Libs/Visualization/VTK/Core/CMakeLists.txt b/Libs/Visualization/VTK/Core/CMakeLists.txt index 4fda795f43..39ffed2afd 100644 --- a/Libs/Visualization/VTK/Core/CMakeLists.txt +++ b/Libs/Visualization/VTK/Core/CMakeLists.txt @@ -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() @@ -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 )