X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=test%2Fstandalone%2FCMakeLists.txt;h=38cbf047efd7060cc9f6e48cda192cb6bcccdda8;hb=35665aca0031dc689940d59cc17e148e6c61334b;hp=86bf9f6c9d60e937ffee2bdb370ed1c6e0b82098;hpb=957677f54b03a149d8f154638a97a2c7b294c8d3;p=modules%2Fparavis.git diff --git a/test/standalone/CMakeLists.txt b/test/standalone/CMakeLists.txt index 86bf9f6c..38cbf047 100644 --- a/test/standalone/CMakeLists.txt +++ b/test/standalone/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2010-2016 CEA/DEN, EDF R&D +# Copyright (C) 2010-2022 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -20,6 +20,7 @@ PROJECT(LightPARAVIS) CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10) +CMAKE_POLICY(SET CMP0053 NEW) # for correct Qt 5 detection procedure IF(WIN32) CMAKE_POLICY(SET CMP0020 OLD) # disable automatic linking to qtmain.lib ENDIF(WIN32) @@ -28,17 +29,12 @@ SET(CMAKE_BUILD_TYPE "Debug") OPTION(LIGHTPARAVIS_WITH_GUI "Build GUI test app" ON) # Package detection -IF (NOT SALOME_GUI_BUILD_WITH_QT5) - FIND_PACKAGE(Qt4 REQUIRED) -ELSE() - FIND_PACKAGE(Qt5Core) - FIND_PACKAGE(Qt5Gui) -ENDIF() +FIND_PACKAGE(Qt5Core) +FIND_PACKAGE(Qt5Gui) + LIST(APPEND CMAKE_PREFIX_PATH "$ENV{PARAVIEW_ROOT_DIR}") FIND_PACKAGE(ParaView REQUIRED) -INCLUDE(${PARAVIEW_USE_FILE}) -INCLUDE(ParaViewMacros) SET(CMAKE_INCLUDE_CURRENT_DIR ON) # Main applications