Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qt5 porting #2

Open
wants to merge 3 commits into
base: feature/qt5
Choose a base branch
from
+8 −7
Open

qt5 porting #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58fc387
Merge pull request #3 from pierrewillenbrockdfki/compile-fixes
pierrewillenbrockdfki May 20, 2022
006a113
remove GECODE_LIBRARIES variable
pierrewillenbrockdfki Feb 4, 2022
2bb9917
Port to qt5
pierrewillenbrockdfki Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ if(COVERAGE)
endif()

rock_init()
rock_find_qt4()
rock_find_qt5(Core Gui Xml Widgets PrintSupport Svg)
rock_standard_layout()
13 changes: 7 additions & 6 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -234,8 +235,6 @@ rock_library(templ
utils/PathConstructor.hpp
DEPS
templ_moft
LIBS
${GECODE_LIBRARIES}
)

rock_library(templ_benchmark
Expand Down Expand Up @@ -372,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
Expand Down