yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3908
committer: Anton Gladky <gladk@xxxxxxxxxx>
timestamp: Wed 2016-06-15 21:52:34 +0200
message:
  Make Yade compatible with VTK7.
  
  Thanks to Luc OGER <luc.oger@xxxxxxxxxxxxxxx>
  https://bugs.launchpad.net/yade/+bug/1586275
modified:
  CMakeLists.txt


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-06-08 17:05:34 +0000
+++ CMakeLists.txt	2016-06-15 19:52:34 +0000
@@ -502,13 +502,13 @@
 TARGET_LINK_LIBRARIES(boot yade)
 
 IF(ENABLE_VTK)
-  IF(${VTK_MAJOR_VERSION} EQUAL 6)
+  IF(${VTK_MAJOR_VERSION} GREATER 5)
     TARGET_LINK_LIBRARIES(yade ${VTK_LIBRARIES})
     ADD_DEFINITIONS("-DYADE_VTK6")
-    MESSAGE(STATUS "VTK version 6 is found")
-  ELSE(${VTK_MAJOR_VERSION} EQUAL 6)
+    MESSAGE(STATUS "VTK version >5 is found")
+  ELSE(${VTK_MAJOR_VERSION} GREATER 5)
     TARGET_LINK_LIBRARIES(yade vtkHybrid)
-  ENDIF(${VTK_MAJOR_VERSION} EQUAL 6)
+  ENDIF(${VTK_MAJOR_VERSION} GREATER 5)
 ENDIF(ENABLE_VTK)
 IF(ENABLE_GUI)
   TARGET_LINK_LIBRARIES(yade _GLViewer ${GUI_LIBS})