/[packages]/cauldron/chewing-editor/current/SOURCES/chewing-editor-0.1.1-fix-build-against-qt-5.11.0.patch
ViewVC logotype

Contents of /cauldron/chewing-editor/current/SOURCES/chewing-editor-0.1.1-fix-build-against-qt-5.11.0.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1234419 - (show annotations) (download)
Mon Jun 4 04:30:47 2018 UTC (5 years, 10 months ago) by daviddavid
File size: 1373 byte(s)
- add patch to fix build with new Qt5 >= 5.11.0

1 diff -Nru a/CMakeLists.txt b/CMakeLists.txt
2 --- a/CMakeLists.txt 2016-04-24 13:06:43.000000000 +0200
3 +++ b/CMakeLists.txt 2018-06-04 06:28:26.278832942 +0200
4 @@ -169,12 +169,12 @@
5 # exporter
6 file(GLOB_RECURSE exporter_src ${PROJECT_SOURCE_DIR}/src/exporter/*)
7 add_library(exporter STATIC ${exporter_src})
8 -qt5_use_modules(exporter Widgets)
9 +target_link_libraries(exporter Qt5::Widgets)
10
11 # importer
12 file(GLOB_RECURSE importer_src ${PROJECT_SOURCE_DIR}/src/importer/*)
13 add_library(importer STATIC ${importer_src})
14 -qt5_use_modules(importer Widgets)
15 +target_link_libraries(importer Qt5::Widgets)
16
17 # ui
18 file(GLOB ui_src ${PROJECT_SOURCE_DIR}/src/ui/*)
19 @@ -183,7 +183,7 @@
20 # util
21 file(GLOB util_src ${PROJECT_SOURCE_DIR}/src/util/*)
22 add_library(util STATIC ${util_src})
23 -qt5_use_modules(util Widgets)
24 +target_link_libraries(util Qt5::Widgets)
25
26 # chewing-editor
27 file(GLOB chewing-editor_src
28 @@ -199,6 +199,7 @@
29 exporter
30 importer
31 util
32 + Qt5::Widgets
33 )
34 if(MSVC)
35 target_link_libraries(chewing-editor # append libraries
36 @@ -214,7 +215,6 @@
37 )
38 endif()
39
40 -qt5_use_modules(chewing-editor Widgets)
41 install(PROGRAMS ${CMAKE_BINARY_DIR}/chewing-editor DESTINATION ${CMAKE_INSTALL_BINDIR})
42
43 # icon
44 @@ -280,8 +280,8 @@
45 importer
46 util
47 pthread
48 + Qt5::Widgets
49 )
50 -qt5_use_modules(run-test Widgets)
51
52 add_test(test run-test)
53

  ViewVC Help
Powered by ViewVC 1.1.30