Merge pull request commontk#595 from finetjul/fix-compilation-on-windows

Fix compilation on Visual Studio
naucoin · Aug 31, 2015 · ef74dc2 · ef74dc2
2 parents 35a187f + 8b12543
commit ef74dc2
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Libs/Visualization/VTK/Core/CMakeLists.txt b/Libs/Visualization/VTK/Core/CMakeLists.txt
@@ -85,13 +85,13 @@ if(${VTK_VERSION_MAJOR} GREATER 5)
   if(TARGET vtkTestingRendering)
     list(APPEND VTK_LIBRARIES vtkTestingRendering )
   endif()
+  # With VTK > 6.2.0 (commit 4f7460a5), vtkRenderingFreeTypeOpenGL has been removed.
+  if(TARGET vtkRenderingFreeTypeOpenGL)
+    list(APPEND VTK_LIBRARIES vtkRenderingFreeTypeOpenGL)
+  endif()
   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
         )