From 83eb68efc39ad8fcb5e4e684afafcfc86b829c96 Mon Sep 17 00:00:00 2001 From: tbaudier Date: Mon, 4 Mar 2019 14:25:06 +0100 Subject: [PATCH] Inverse VTK_VERSION VERSION_GREATER to VERSION_LESS It seems that VERSION_GREATER is not granter and equal, so I prefer to use VERSION_LESS to include the version 8.2.0 --- vv/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt index 6f22571..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.2.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) -- 2.47.1