Pārlūkot izejas kodu

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

Fix compilation on Visual Studio
Julien Finet 9 gadi atpakaļ
vecāks
revīzija
ef74dc2580
1 mainītis faili ar 4 papildinājumiem un 4 dzēšanām
  1. 4 4
      Libs/Visualization/VTK/Core/CMakeLists.txt

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

@@ -85,13 +85,13 @@ if(${VTK_VERSION_MAJOR} GREATER 5)
   if(TARGET vtkTestingRendering)
   if(TARGET vtkTestingRendering)
     list(APPEND VTK_LIBRARIES vtkTestingRendering )
     list(APPEND VTK_LIBRARIES vtkTestingRendering )
   endif()
   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)
   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
         )
         )