Quellcode durchsuchen

Merge branch '307-fix-compile-link-error-vtk62-qt5-debian-sid'

* 307-fix-compile-link-error-vtk62-qt5-debian-sid:
  Fix compile and link errors when using QT5 on Debian
Jean-Christophe Fillion-Robin vor 9 Jahren
Ursprung
Commit
d709c15b65

+ 1 - 0
Libs/Visualization/VTK/Core/Testing/Cpp/CMakeLists.txt

@@ -40,6 +40,7 @@ if(CTK_QT_VERSION VERSION_GREATER "4")
   QT5_GENERATE_MOCS(
     ctkVTKConnectionTestObjectDelete.cpp
     )
+  include_directories(${Qt5Widgets_INCLUDE_DIRS})
 else()
   QT4_WRAP_CPP(KIT_HELPER_SRCS ctkVTKObjectTestHelper.h)
   QT4_GENERATE_MOCS(

+ 6 - 0
Libs/Visualization/VTK/Widgets/Testing/Cpp/CMakeLists.txt

@@ -137,8 +137,14 @@ else()
   set(VTK_CHARTS_LIB vtkCharts)
 endif()
 
+
+
 target_link_libraries(${KIT}CppTests ${LIBRARY_NAME} ${VTK_CHARTS_LIB} ${CTK_BASE_LIBRARIES})
 
+if(CTK_QT_VERSION VERSION_GREATER "4")
+    target_link_libraries(${KIT}CppTests ${Qt5Test_LIBRARIES})
+endif()
+
 #
 # Add Tests
 #