X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FCMakeLists.txt;h=107fdefd4f91412de42156ebb29fe3c7c228d8ab;hb=3679ae18afeecb43cc9deab389723e69a64c5daf;hp=9453e1b0362114fecc112a6a3e1b9ec21b81c992;hpb=75719c377dd8aa759f32dd277cfd7b2f914ebfa8;p=clitk.git diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt index 9453e1b..107fdef 100644 --- a/vv/CMakeLists.txt +++ b/vv/CMakeLists.txt @@ -239,21 +239,21 @@ endif(CLITK_USE_PACS_CONNECTION) #Special case for Main Window with QVTKWidget according VTK version foreach(tool ${vv_TOOLS_VTK7} ${vv_COMMON_WITH_UI_VTK7}) set(vv_SRCS ${vv_SRCS} ${tool}.cxx) - if(VTK_VERSION VERSION_GREATER "8.0.0") + if(VTK_VERSION VERSION_LESS "8.2.0") if(vv_QT_VERSION VERSION_GREATER "4") QT5_WRAP_CPP(vv_SRCS ${tool}.h) - QT5_WRAP_UI(vv_UI_CXX qt_ui/${tool}.ui) + QT5_WRAP_UI(vv_UI_CXX qt_ui/${tool}VTK7.ui) else() QT4_WRAP_CPP(vv_SRCS ${tool}.h) - QT4_WRAP_UI(vv_UI_CXX qt_ui/${tool}.ui) + QT4_WRAP_UI(vv_UI_CXX qt_ui/${tool}VTK7.ui) endif() else() if(vv_QT_VERSION VERSION_GREATER "4") QT5_WRAP_CPP(vv_SRCS ${tool}.h) - QT5_WRAP_UI(vv_UI_CXX qt_ui/${tool}VTK7.ui) + QT5_WRAP_UI(vv_UI_CXX qt_ui/${tool}.ui) else() QT4_WRAP_CPP(vv_SRCS ${tool}.h) - QT4_WRAP_UI(vv_UI_CXX qt_ui/${tool}VTK7.ui) + QT4_WRAP_UI(vv_UI_CXX qt_ui/${tool}.ui) endif() endif() endforeach(tool)