From 006a11391b10b5e97fe112ee74ffc1046390a35c Mon Sep 17 00:00:00 2001 From: Pierre Willenbrock Date: Fri, 4 Feb 2022 12:11:12 +0100 Subject: [PATCH 1/2] remove GECODE_LIBRARIES variable gecode is found and provided by moreorg and it is never set in this project. --- src/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d37ca148..d1541424 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -234,8 +234,6 @@ rock_library(templ utils/PathConstructor.hpp DEPS templ_moft - LIBS - ${GECODE_LIBRARIES} ) rock_library(templ_benchmark From 2bb9917c672620a014ce5417324f1ce46e9350bf Mon Sep 17 00:00:00 2001 From: Pierre Willenbrock Date: Fri, 4 Feb 2022 12:10:54 +0100 Subject: [PATCH 2/2] Port to qt5 --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ba9e4d4b..31ea8958 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,5 +34,5 @@ if(COVERAGE) endif() rock_init() -rock_find_qt4() +rock_find_qt5(Core Gui Xml Widgets PrintSupport Svg) rock_standard_layout() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d1541424..1d39af38 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,6 @@ find_package(Boost REQUIRED system filesystem serialization program_options) -# For adding the qt4 resources + +# For adding the qt5 resources set(CMAKE_AUTORCC ON) rock_library(templ_core SOURCES @@ -370,9 +371,11 @@ rock_library(templ_gui gui/widgets/TemporalConstraintQuantitative.hpp DEPS templ - DEPS_PKGCONFIG - QtGui - QtXml + Qt5::Gui + Qt5::Widgets + Qt5::Xml + Qt5::PrintSupport + Qt5::Svg UI gui/TemplGui.ui gui/dialogs/AddLocation.ui