-
Notifications
You must be signed in to change notification settings - Fork 1
/
patch-kde.sh
executable file
·4247 lines (3776 loc) · 161 KB
/
patch-kde.sh
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
############ kded ############
echo Patching ./frameworks/kded
git -C ./frameworks/kded checkout .
patch -p1 -d ./frameworks/kded <<'EOF'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f76e077..8685a4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,6 +18,8 @@ include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
+find_Qt5GuiExtras()
+
find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED)
@@ -25,7 +27,10 @@ find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5DocTools ${KF5_DEP_VERSION})
find_package(KF5Init ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5Service ${KF5_DEP_VERSION} REQUIRED)
-
+if(NOT BUILD_SHARED_LIBS)
+ find_package(KF5I18n ${KF5_DEP_VERSION})
+ find_package(KF5WindowSystem ${KF5_DEP_VERSION})
+endif()
include(CMakePackageConfigHelpers)
include(ECMSetupVersion)
diff --git a/src/kded.cpp b/src/kded.cpp
index ed03dcd..a5cbf90 100644
--- a/src/kded.cpp
+++ b/src/kded.cpp
@@ -51,6 +51,19 @@
#include <CoreFoundation/CoreFoundation.h>
#endif
+#ifndef BUILD_SHARED_LIBS
+#include <QtPlugin>
+#if HAVE_X11
+Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
+#endif
+#if defined _WIN32 || defined _WIN64
+Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
+#endif
+#ifdef __APPLE__
+Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
+#endif
+#endif
+
Q_DECLARE_LOGGING_CATEGORY(KDED)
Q_LOGGING_CATEGORY(KDED, "kf5.kded", QtWarningMsg)
EOF
############ kjs ############
echo Patching ./frameworks/kjs
git -C ./frameworks/kjs checkout .
patch -p1 -d ./frameworks/kjs <<'EOF'
diff --git a/src/kjs/CMakeLists.txt b/src/kjs/CMakeLists.txt
index a51a71d..b604532 100644
--- a/src/kjs/CMakeLists.txt
+++ b/src/kjs/CMakeLists.txt
@@ -71,7 +71,9 @@ endif()
# get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
#get_target_property(ICEMAKER_EXECUTABLE icemaker WRAPPER_SCRIPT)
#get_target_property(ICEMAKER_EXECUTABLE_DIR icemaker RUNTIME_OUTPUT_DIRECTORY)
- set(ICEMAKER_EXECUTABLE icemaker)
+ if (NOT ICEMAKER_EXECUTABLE)
+ set(ICEMAKER_EXECUTABLE icemaker)
+ endif()
# export(TARGETS icemaker FILE ${CMAKE_BINARY_DIR}/ImportIcemakerExecutable.cmake)
# endif ()
diff --git a/src/wtf/CMakeLists.txt b/src/wtf/CMakeLists.txt
index c05f7a4..f1ec9c8 100644
--- a/src/wtf/CMakeLists.txt
+++ b/src/wtf/CMakeLists.txt
@@ -4,7 +4,7 @@
#set(wtf_LIB_SRCS HashTable.cpp )
-#add_library(wtf SHARED ${wtf_LIB_SRCS})
+#add_library(wtf ${wtf_LIB_SRCS})
#set_target_properties(wtf PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
#install(TARGETS wtf ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} )
EOF
############ kimageformats ############
echo Patching ./frameworks/kimageformats
git -C ./frameworks/kimageformats checkout .
patch -p1 -d ./frameworks/kimageformats <<'EOF'
diff --git a/src/imageformats/CMakeLists.txt b/src/imageformats/CMakeLists.txt
index 0dc9707..15a5619 100644
--- a/src/imageformats/CMakeLists.txt
+++ b/src/imageformats/CMakeLists.txt
@@ -15,7 +15,7 @@ function(kimageformats_add_plugin plugin)
message(FATAL_ERROR "JSON file doesn't exist: ${json}")
endif()
- add_library(${plugin} MODULE ${KIF_ADD_PLUGIN_SOURCES})
+ add_library(${plugin} ${MODULE} ${KIF_ADD_PLUGIN_SOURCES})
set_property(TARGET ${plugin} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS ${json})
set_target_properties(${plugin} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/imageformats")
target_link_libraries(${plugin} Qt5::Gui)
EOF
############ knotifyconfig ############
echo Patching ./frameworks/knotifyconfig
git -C ./frameworks/knotifyconfig checkout .
patch -p1 -d ./frameworks/knotifyconfig <<'EOF'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc9d413..6a06d63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,12 +25,29 @@ endif()
include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
+
+if(NOT BUILD_SHARED_LIBS)
+ find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Concurrent PrintSupport Svg)
+ find_Qt5GuiExtras()
+endif()
+
find_package(Phonon4Qt5 4.6.60 NO_MODULE)
find_package(KF5Completion ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5KIO ${KF5_DEP_VERSION} REQUIRED)
+if(NOT BUILD_SHARED_LIBS)
+ find_package(KF5Attica ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5GlobalAccel ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5TextWidgets ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5Archive ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED)
+endif()
# Includes
EOF
############ kidletime ############
echo Patching ./frameworks/kidletime
git -C ./frameworks/kidletime checkout .
patch -p1 -d ./frameworks/kidletime <<'EOF'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ca9c45..a00c43e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,8 +42,9 @@ if(NOT APPLE)
find_package(XCB COMPONENTS XCB)
endif()
+find_Qt5GuiExtras()
+
if(X11_FOUND)
- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
find_package(XCB COMPONENTS XCB SYNC)
find_package(X11_XCB)
set(HAVE_X11 TRUE)
diff --git a/src/plugins/osx/CMakeLists.txt b/src/plugins/osx/CMakeLists.txt
index e1b50b8..a0c664d 100644
--- a/src/plugins/osx/CMakeLists.txt
+++ b/src/plugins/osx/CMakeLists.txt
@@ -2,7 +2,7 @@ set(osx_plugin_SRCS
macpoller.cpp
)
-add_library(KF5IdleTimeOsxPlugin MODULE ${osx_plugin_SRCS})
+add_library(KF5IdleTimeOsxPlugin ${MODULE} ${osx_plugin_SRCS})
target_link_libraries(KF5IdleTimeOsxPlugin
KF5IdleTime
"-framework CoreFoundation -framework Carbon"
diff --git a/src/plugins/windows/CMakeLists.txt b/src/plugins/windows/CMakeLists.txt
index 61c9364..57865c8 100644
--- a/src/plugins/windows/CMakeLists.txt
+++ b/src/plugins/windows/CMakeLists.txt
@@ -2,7 +2,7 @@ set(windows_plugin_SRCS
windowspoller.cpp
)
-add_library(KF5IdleTimeWindowsPlugin MODULE ${windows_plugin_SRCS})
+add_library(KF5IdleTimeWindowsPlugin ${MODULE} ${windows_plugin_SRCS})
target_link_libraries(KF5IdleTimeWindowsPlugin
KF5IdleTime
)
diff --git a/src/plugins/xscreensaver/CMakeLists.txt b/src/plugins/xscreensaver/CMakeLists.txt
index 6842a03..9e1cbc5 100644
--- a/src/plugins/xscreensaver/CMakeLists.txt
+++ b/src/plugins/xscreensaver/CMakeLists.txt
@@ -4,7 +4,7 @@ set(xscreensaver_plugin_SRCS
qt5_add_dbus_interface(xscreensaver_plugin_SRCS org.freedesktop.ScreenSaver.xml screensaver_interface)
-add_library(KF5IdleTimeXcbPlugin1 MODULE ${xscreensaver_plugin_SRCS})
+add_library(KF5IdleTimeXcbPlugin1 ${MODULE} ${xscreensaver_plugin_SRCS})
target_link_libraries(KF5IdleTimeXcbPlugin1
KF5IdleTime
Qt5::DBus
diff --git a/src/plugins/xsync/CMakeLists.txt b/src/plugins/xsync/CMakeLists.txt
index d31feb5..23ccc54 100644
--- a/src/plugins/xsync/CMakeLists.txt
+++ b/src/plugins/xsync/CMakeLists.txt
@@ -7,7 +7,7 @@ set(xsync_plugin_SRCS
ecm_qt_declare_logging_category(xsync_plugin_SRCS HEADER xsync_logging.h IDENTIFIER KIDLETIME_XSYNC_PLUGIN CATEGORY_NAME org.kde.kf5.idletime.xsync)
-add_library(KF5IdleTimeXcbPlugin0 MODULE ${xsync_plugin_SRCS})
+add_library(KF5IdleTimeXcbPlugin0 ${MODULE} ${xsync_plugin_SRCS})
target_link_libraries(KF5IdleTimeXcbPlugin0
KF5IdleTime
Qt5::X11Extras
EOF
############ ktextwidgets ############
echo Patching ./frameworks/ktextwidgets
git -C ./frameworks/ktextwidgets checkout .
patch -p1 -d ./frameworks/ktextwidgets <<'EOF'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0142ca..6359cb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,11 @@ ecm_setup_version(PROJECT
set(REQUIRED_QT_VERSION 5.9.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets)
+if(NOT BUILD_SHARED_LIBS)
+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Svg)
+ find_Qt5GuiExtras()
+endif()
+
find_package(Qt5 OPTIONAL_COMPONENTS TextToSpeech)
if (NOT Qt5TextToSpeech_FOUND)
@@ -49,6 +54,12 @@ find_package(KF5Service ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5Sonnet ${KF5_DEP_VERSION} REQUIRED)
+if(NOT BUILD_SHARED_LIBS)
+ find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5Archive ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5ItemViews ${KF5_DEP_VERSION} REQUIRED)
+endif()
option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
EOF
############ kdoctools ############
echo Patching ./frameworks/kdoctools
git -C ./frameworks/kdoctools checkout .
patch -p1 -d ./frameworks/kdoctools <<'EOF'
diff --git a/KF5DocToolsMacros.cmake b/KF5DocToolsMacros.cmake
index 88a2b3e..e6b01b4 100644
--- a/KF5DocToolsMacros.cmake
+++ b/KF5DocToolsMacros.cmake
@@ -84,6 +84,11 @@
set(KDOCTOOLS_SERIALIZE_TOOL "" CACHE STRING "Tool to serialize resource-intensive commands in parallel builds")
set(KDOCTOOLS_MEINPROC_EXECUTABLE "KF5::meinproc5")
+if(CMAKE_CROSSCOMPILING AND MEINPROC5_EXECUTABLE)
+ set(KDOCTOOLS_MEINPROC_EXECUTABLE ${MEINPROC5_EXECUTABLE})
+else()
+ set(KDOCTOOLS_MEINPROC_EXECUTABLE "KF5::meinproc5")
+endif()
if(KDOCTOOLS_SERIALIZE_TOOL)
# parallel build with many meinproc invocations can consume a huge amount of memory
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 24f75a4..9a3cf7d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,7 +34,7 @@ ecm_qt_declare_logging_category(kdoctoolslog_core_SRCS
)
# needed by KIO, need to export it
-add_library(KF5DocTools SHARED xslt.cpp xslt_kde.cpp ${kdoctoolslog_core_SRCS})
+add_library(KF5DocTools xslt.cpp xslt_kde.cpp ${kdoctoolslog_core_SRCS})
generate_export_header(KF5DocTools BASE_NAME KDocTools EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/kdoctools_export.h")
add_library(KF5::DocTools ALIAS KF5DocTools)
if (NOT MEINPROC_NO_KARCHIVE)
@@ -101,7 +101,11 @@ if(MEINPROC_NO_KARCHIVE)
add_definitions(-DMEINPROC_NO_KARCHIVE) #we don't have saveToCache when compiling without KArchive, which is used in xslt_kde.cpp
else ()
set(meinproc_additional_SRCS xslt_kde.cpp)
- set(meinproc_additional_LIBS KF5::Archive)
+ if(BUILD_SHARED_LIBS)
+ set(meinproc_additional_LIBS KF5::Archive)
+ else()
+ set(meinproc_additional_LIBS KF5::Archive libxml2.a libgcrypt.a libgpg-error.a)
+ endif()
endif()
add_executable(meinproc5 meinproc.cpp meinproc_common.cpp xslt.cpp ${meinproc_additional_SRCS} ${kdoctoolslog_core_SRCS})
@@ -205,7 +209,7 @@ set( docbookl10nhelper_SRCS docbookl10nhelper.cpp ${kdoctoolslog_core_SRCS})
add_executable( docbookl10nhelper ${docbookl10nhelper_SRCS} )
ecm_mark_nongui_executable( docbookl10nhelper )
target_link_libraries( docbookl10nhelper Qt5::Core )
-if(INSTALL_INTERNAL_TOOLS)
+if(INSTALL_INTERNAL_TOOLS OR (CMAKE_CROSSCOMPILING AND MEINPROC5_EXECUTABLE))
install(TARGETS docbookl10nhelper EXPORT KF5DocToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
endif()
EOF
############ ki18n ############
echo Patching ./frameworks/ki18n
git -C ./frameworks/ki18n checkout .
patch -p1 -d ./frameworks/ki18n <<'EOF'
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 850aaaa..f8356e7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -69,7 +69,7 @@ set(ktranscript_LIB_SRCS
ktranscript.cpp
common_helpers.cpp
)
-add_library(ktranscript MODULE ${ktranscript_LIB_SRCS})
+add_library(ktranscript ${MODULE} ${ktranscript_LIB_SRCS})
generate_export_header(ktranscript BASE_NAME KTranscript)
target_link_libraries(ktranscript PRIVATE Qt5::Qml Qt5::Core)
EOF
############ kparts ############
echo Patching ./frameworks/kparts
git -C ./frameworks/kparts checkout .
patch -p1 -d ./frameworks/kparts <<'EOF'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46fec75..4848812 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,11 @@ include(KDECMakeSettings)
include(KDEPackageAppTemplates)
include(ECMAddQch)
+if(NOT BUILD_SHARED_LIBS)
+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Concurrent Svg PrintSupport TextToSpeech)
+ find_Qt5GuiExtras()
+endif()
+
include(GenerateExportHeader)
include(ECMSetupVersion)
@@ -42,6 +47,18 @@ find_package(KF5Service ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5TextWidgets ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5XmlGui ${KF5_DEP_VERSION} REQUIRED)
+if(NOT BUILD_SHARED_LIBS)
+ find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5Archive ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5Attica ${KF5_DEP_VERSION} REQUIRED)
+ find_package(X11)
+ if (X11_FOUND)
+ find_package(KF5GlobalAccel ${KF5_DEP_VERSION} REQUIRED)
+ endif ()
+ find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED)
+endif()
remove_definitions(-DQT_NO_CAST_FROM_ASCII)
remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
diff --git a/templates/kpartsapp/src/part/CMakeLists.txt b/templates/kpartsapp/src/part/CMakeLists.txt
index 006bd84..623512a 100644
--- a/templates/kpartsapp/src/part/CMakeLists.txt
+++ b/templates/kpartsapp/src/part/CMakeLists.txt
@@ -4,7 +4,7 @@ set(%{APPNAMELC}_PART_SRCS
%{APPNAMELC}part.cpp
)
-add_library(%{APPNAMELC}part MODULE ${%{APPNAMELC}_PART_SRCS})
+add_library(%{APPNAMELC}part ${MODULE} ${%{APPNAMELC}_PART_SRCS})
target_link_libraries(%{APPNAMELC}part
KF5::I18n
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f8c69e6..64e10dd 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -21,13 +21,13 @@ target_link_libraries(normalktmtest ${PARTS_TEST_LIBRARY_DEPENDENCIES})
########### next target ###############
-add_library(spellcheckplugin MODULE plugin_spellcheck.cpp)
+add_library(spellcheckplugin ${MODULE} plugin_spellcheck.cpp)
target_link_libraries(spellcheckplugin ${PARTS_TEST_LIBRARY_DEPENDENCIES} )
install(TARGETS spellcheckplugin DESTINATION ${KDE_INSTALL_PLUGINDIR} )
########### next target ###############
-add_library(notepadpart MODULE notepad.cpp)
+add_library(notepadpart ${MODULE} notepad.cpp)
target_link_libraries(notepadpart ${PARTS_TEST_LIBRARY_DEPENDENCIES})
install(TARGETS notepadpart DESTINATION ${KDE_INSTALL_PLUGINDIR} )
EOF
############ knewstuff ############
echo Patching ./frameworks/knewstuff
git -C ./frameworks/knewstuff checkout .
patch -p1 -d ./frameworks/knewstuff <<'EOF'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8389685..06584d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,8 @@ include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
set(REQUIRED_QT_VERSION 5.9.0)
-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Widgets Xml)
+find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Widgets Xml Concurrent PrintSupport Svg TextToSpeech)
+find_Qt5GuiExtras()
find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE COMPONENTS Qml Quick)
find_package(KF5Archive ${KF5_DEP_VERSION} REQUIRED)
@@ -31,6 +32,13 @@ find_package(KF5Service ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5TextWidgets ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5XmlGui ${KF5_DEP_VERSION} REQUIRED)
+if(NOT BUILD_SHARED_LIBS)
+ find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5GlobalAccel ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED)
+endif()
include(GenerateExportHeader)
include(ECMSetupVersion)
EOF
############ networkmanager-qt ############
echo Patching ./frameworks/networkmanager-qt
git -C ./frameworks/networkmanager-qt checkout .
patch -p1 -d ./frameworks/networkmanager-qt <<'EOF'
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 72b7fcf..f119eef 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -135,7 +135,7 @@ set(DBUS_INTERFACE_SRCS
dbus/wirelessdeviceinterface.cpp
)
-add_library(KF5NetworkManagerQt SHARED ${NetworkManagerQt_PART_SRCS} ${NetworkManagerQt_SETTINGS_SRCS} ${DBUS_INTERFACE_SRCS})
+add_library(KF5NetworkManagerQt ${NetworkManagerQt_PART_SRCS} ${NetworkManagerQt_SETTINGS_SRCS} ${DBUS_INTERFACE_SRCS})
generate_export_header(KF5NetworkManagerQt EXPORT_FILE_NAME ${NetworkManagerQt_BINARY_DIR}/networkmanagerqt/networkmanagerqt_export.h BASE_NAME NetworkManagerQt)
add_library(KF5::NetworkManagerQt ALIAS KF5NetworkManagerQt)
EOF
############ frameworkintegration ############
echo Patching ./frameworks/frameworkintegration
git -C ./frameworks/frameworkintegration checkout .
patch -p1 -d ./frameworks/frameworkintegration <<'EOF'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2c34da..cbdcda4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,10 @@ include(KDECMakeSettings)
set(REQUIRED_QT_VERSION 5.9.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus Widgets)
-
+if(NOT BUILD_SHARED_LIBS)
+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus Widgets Svg TextToSpeech)
+ find_Qt5GuiExtras()
+endif()
ecm_setup_version(PROJECT VARIABLE_PREFIX FRAMEWORKINTEGRATION
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/frameworkintegration_version.h"
@@ -44,8 +47,16 @@ if (BUILD_KPACKAGE_INSTALL_HANDLERS)
find_package(KF5Package ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED)
- find_package(packagekitqt5)
- find_package(AppStreamQt 0.10.4)
+ if(NOT BUILD_SHARED_LIBS)
+ find_package(KF5Archive ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5ItemViews ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED)
+ find_package(Phonon4Qt5 4.6.60)
+ else()
+ find_package(packagekitqt5)
+ find_package(AppStreamQt 0.10.4)
+ endif()
endif()
add_subdirectory(src)
diff --git a/src/integrationplugin/CMakeLists.txt b/src/integrationplugin/CMakeLists.txt
index fc28857..1ee9454 100644
--- a/src/integrationplugin/CMakeLists.txt
+++ b/src/integrationplugin/CMakeLists.txt
@@ -1,6 +1,6 @@
add_library(FrameworkIntegrationPlugin
- MODULE frameworkintegrationplugin.cpp)
+ ${MODULE} frameworkintegrationplugin.cpp)
target_link_libraries(FrameworkIntegrationPlugin
PRIVATE
EOF
############ bluez-qt ############
echo Patching ./frameworks/bluez-qt
git -C ./frameworks/bluez-qt checkout .
patch -p1 -d ./frameworks/bluez-qt <<'EOF'
diff --git a/src/imports/CMakeLists.txt b/src/imports/CMakeLists.txt
index 59668a5..38d3e59 100644
--- a/src/imports/CMakeLists.txt
+++ b/src/imports/CMakeLists.txt
@@ -12,7 +12,7 @@ set(bluezqtextensionplugin_SRCS
configure_file(qmldir org/kde/bluezqt/qmldir COPYONLY)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY org/kde/bluezqt)
-add_library(bluezqtextensionplugin SHARED ${bluezqtextensionplugin_SRCS})
+add_library(bluezqtextensionplugin ${bluezqtextensionplugin_SRCS})
target_link_libraries(bluezqtextensionplugin
Qt5::Core
EOF
############ krunner ############
echo Patching ./frameworks/krunner
git -C ./frameworks/krunner checkout .
patch -p1 -d ./frameworks/krunner <<'EOF'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 506d155..e72b360 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,10 @@ ecm_setup_version(PROJECT
set(REQUIRED_QT_VERSION 5.9.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Gui Widgets Quick)
+if(NOT BUILD_SHARED_LIBS)
+ find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Sql Svg PrintSupport TextToSpeech)
+endif()
+find_Qt5GuiExtras()
find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
@@ -45,6 +49,22 @@ find_package(KF5KIO ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5Service ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5Plasma ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5ThreadWeaver ${KF5_DEP_VERSION} REQUIRED)
+if(NOT BUILD_SHARED_LIBS)
+ find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5Archive ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5Declarative ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5TextWidgets ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5Attica ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5GlobalAccel ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5Notifications ${KF5_DEP_VERSION} REQUIRED)
+
+ find_package(Phonon4Qt5 4.6.60 REQUIRED)
+ find_package(XCB COMPONENTS XCB)
+endif()
set(KRunner_AUTOMOC_MACRO_NAMES "K_EXPORT_PLASMA_RUNNER" "K_EXPORT_RUNNER_CONFIG")
if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
diff --git a/src/declarative/CMakeLists.txt b/src/declarative/CMakeLists.txt
index 83837b0..0f0a792 100644
--- a/src/declarative/CMakeLists.txt
+++ b/src/declarative/CMakeLists.txt
@@ -6,7 +6,7 @@ set(runnermodel_SRCS
)
ecm_qt_declare_logging_category(runnermodel_SRCS HEADER krunner_debug.h IDENTIFIER KRUNNER CATEGORY_NAME org.kde.krunner)
-add_library(runnermodelplugin SHARED ${runnermodel_SRCS})
+add_library(runnermodelplugin ${runnermodel_SRCS})
target_link_libraries(runnermodelplugin
Qt5::Quick
Qt5::Qml
diff --git a/templates/runner/src/CMakeLists.txt b/templates/runner/src/CMakeLists.txt
index b6fabfd..0a0e059 100644
--- a/templates/runner/src/CMakeLists.txt
+++ b/templates/runner/src/CMakeLists.txt
@@ -2,7 +2,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasma_runner_org.kde.%{APPNAMELC}\")
set(%{APPNAMELC}_SRCS %{APPNAMELC}.cpp)
-add_library(krunner_%{APPNAMELC} MODULE ${%{APPNAMELC}_SRCS})
+add_library(krunner_%{APPNAMELC} ${MODULE} ${%{APPNAMELC}_SRCS})
target_link_libraries(krunner_%{APPNAMELC} KF5::Runner KF5::I18n)
install(TARGETS krunner_%{APPNAMELC} DESTINATION ${KDE_INSTALL_PLUGINDIR})
EOF
############ kfilemetadata ############
echo Patching ./frameworks/kfilemetadata
git -C ./frameworks/kfilemetadata checkout .
patch -p1 -d ./frameworks/kfilemetadata <<'EOF'
diff --git a/src/extractors/CMakeLists.txt b/src/extractors/CMakeLists.txt
index 15399f7..b514f40 100644
--- a/src/extractors/CMakeLists.txt
+++ b/src/extractors/CMakeLists.txt
@@ -1,7 +1,7 @@
if(Poppler_Qt5_FOUND)
- add_library(kfilemetadata_popplerextractor MODULE popplerextractor.cpp)
+ add_library(kfilemetadata_popplerextractor ${MODULE} popplerextractor.cpp)
target_link_libraries(kfilemetadata_popplerextractor
KF5::FileMetaData
@@ -16,7 +16,7 @@ if(Poppler_Qt5_FOUND)
endif()
if(TAGLIB_FOUND)
- add_library(kfilemetadata_taglibextractor MODULE taglibextractor.cpp )
+ add_library(kfilemetadata_taglibextractor ${MODULE} taglibextractor.cpp )
target_include_directories(kfilemetadata_taglibextractor SYSTEM PRIVATE ${TAGLIB_INCLUDES})
target_link_libraries( kfilemetadata_taglibextractor
KF5::FileMetaData
@@ -30,7 +30,7 @@ if(TAGLIB_FOUND)
endif()
if(LibExiv2_FOUND)
- add_library(kfilemetadata_exiv2extractor MODULE exiv2extractor.cpp)
+ add_library(kfilemetadata_exiv2extractor ${MODULE} exiv2extractor.cpp)
kde_target_enable_exceptions(kfilemetadata_exiv2extractor PRIVATE)
target_link_libraries(kfilemetadata_exiv2extractor
KF5::FileMetaData
@@ -45,7 +45,7 @@ if(LibExiv2_FOUND)
endif()
if(FFMPEG_FOUND)
- add_library(kfilemetadata_ffmpegextractor MODULE ffmpegextractor.cpp)
+ add_library(kfilemetadata_ffmpegextractor ${MODULE} ffmpegextractor.cpp)
target_include_directories(kfilemetadata_ffmpegextractor SYSTEM PRIVATE ${AVCODEC_INCLUDE_DIRS} ${AVFORMAT_INCLUDE_DIRS} ${AVUTIL_INCLUDE_DIRS})
target_link_libraries(kfilemetadata_ffmpegextractor
KF5::FileMetaData
@@ -63,7 +63,7 @@ endif()
if(EPUB_FOUND)
- add_library(kfilemetadata_epubextractor MODULE epubextractor.cpp)
+ add_library(kfilemetadata_epubextractor ${MODULE} epubextractor.cpp)
target_include_directories(kfilemetadata_epubextractor SYSTEM PRIVATE ${EPUB_INCLUDE_DIR})
target_link_libraries(kfilemetadata_epubextractor
KF5::FileMetaData
@@ -80,7 +80,7 @@ endif()
#
# Plain Text
#
-add_library(kfilemetadata_plaintextextractor MODULE plaintextextractor.cpp)
+add_library(kfilemetadata_plaintextextractor ${MODULE} plaintextextractor.cpp)
target_link_libraries( kfilemetadata_plaintextextractor
KF5::FileMetaData
@@ -94,7 +94,7 @@ DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kfilemetadata)
#
# PO
#
-add_library(kfilemetadata_poextractor MODULE poextractor.cpp)
+add_library(kfilemetadata_poextractor ${MODULE} poextractor.cpp)
target_link_libraries( kfilemetadata_poextractor
KF5::FileMetaData
)
@@ -107,7 +107,7 @@ DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kfilemetadata)
#
# XML
#
-add_library(kfilemetadata_xmlextractor MODULE
+add_library(kfilemetadata_xmlextractor ${MODULE}
dublincoreextractor.cpp
xmlextractor.cpp
../kfilemetadata_debug.cpp
@@ -127,7 +127,7 @@ install(
#
# Postscript DSC
#
-add_library(kfilemetadata_postscriptdscextractor MODULE
+add_library(kfilemetadata_postscriptdscextractor ${MODULE}
postscriptdscextractor.cpp
../kfilemetadata_debug.cpp
)
@@ -147,7 +147,7 @@ install(
#
if(KF5Archive_FOUND)
- add_library(kfilemetadata_odfextractor MODULE odfextractor.cpp)
+ add_library(kfilemetadata_odfextractor ${MODULE} odfextractor.cpp)
target_link_libraries(kfilemetadata_odfextractor
KF5::FileMetaData
@@ -167,7 +167,7 @@ endif()
#
if(KF5Archive_FOUND)
- add_library(kfilemetadata_office2007extractor MODULE office2007extractor.cpp)
+ add_library(kfilemetadata_office2007extractor ${MODULE} office2007extractor.cpp)
target_link_libraries(kfilemetadata_office2007extractor
KF5::FileMetaData
@@ -186,7 +186,7 @@ endif()
# Office (binary formats)
#
-add_library(kfilemetadata_officeextractor MODULE officeextractor.cpp)
+add_library(kfilemetadata_officeextractor ${MODULE} officeextractor.cpp)
target_link_libraries(kfilemetadata_officeextractor
KF5::FileMetaData
@@ -201,7 +201,7 @@ DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kfilemetadata)
# Mobipocket
#
if (QMOBIPOCKET_FOUND)
- add_library(kfilemetadata_mobiextractor MODULE mobiextractor.cpp)
+ add_library(kfilemetadata_mobiextractor ${MODULE} mobiextractor.cpp)
target_include_directories(kfilemetadata_mobiextractor SYSTEM PRIVATE ${QMOBIPOCKET_INCLUDE_DIR})
target_link_libraries(kfilemetadata_mobiextractor
KF5::FileMetaData
diff --git a/src/writers/CMakeLists.txt b/src/writers/CMakeLists.txt
index 864dc51..adfce40 100644
--- a/src/writers/CMakeLists.txt
+++ b/src/writers/CMakeLists.txt
@@ -1,5 +1,5 @@
if(TAGLIB_FOUND)
- add_library(kfilemetadata_taglibwriter MODULE taglibwriter.cpp)
+ add_library(kfilemetadata_taglibwriter ${MODULE} taglibwriter.cpp)
target_include_directories(kfilemetadata_taglibwriter SYSTEM PRIVATE ${TAGLIB_INCLUDES})
target_link_libraries( kfilemetadata_taglibwriter
EOF
############ kservice ############
echo Patching ./frameworks/kservice
git -C ./frameworks/kservice checkout .
patch -p1 -d ./frameworks/kservice <<'EOF'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b39106c..a60471d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,13 +42,16 @@ set(APPLICATIONS_MENU_NAME applications.menu
# Dependencies
set(REQUIRED_QT_VERSION 5.9.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus Xml)
-
+find_Qt5GuiExtras()
find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5DocTools ${KF5_DEP_VERSION})
+if(NOT BUILD_SHARED_LIBS)
+ find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED)
+endif()
find_package(FLEX REQUIRED)
set_package_properties(FLEX PROPERTIES
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index b6c3a7b..dd8b083 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -37,7 +37,7 @@ target_sources(kservicetest PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../src/services/ktraderparsetree.cpp
)
-add_library(fakeplugin MODULE nsaplugin.cpp)
+add_library(fakeplugin ${MODULE} nsaplugin.cpp)
ecm_mark_as_test(fakeplugin)
target_link_libraries(fakeplugin KF5::Service)
EOF
############ kmediaplayer ############
echo Patching ./frameworks/kmediaplayer
git -C ./frameworks/kmediaplayer checkout .
patch -p1 -d ./frameworks/kmediaplayer <<'EOF'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52eb6a4..b9b6423 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,10 @@ find_package(ECM 5.54.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
+if(NOT BUILD_SHARED_LIBS)
+ find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED)
+endif()
+
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
include(KDEInstallDirs)
@@ -45,10 +49,23 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kmediaplayer_version.h
set(REQUIRED_QT_VERSION 5.9.0)
find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
+if(NOT BUILD_SHARED_LIBS)
+ find_package(Qt5 ${REQUIRED_QT_VERSION} COMPONENTS Concurrent PrintSupport TextToSpeech Svg)
+ find_Qt5GuiExtras()
+endif()
find_package(KF5Parts ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5XmlGui ${KF5_DEP_VERSION} REQUIRED)
+if(NOT BUILD_SHARED_LIBS)
+ find_package(KF5Attica ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5GlobalAccel ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5Archive ${KF5_DEP_VERSION} REQUIRED)
+endif()
#
# Subdirectories
EOF
############ kirigami ############
echo Patching ./frameworks/kirigami
git -C ./frameworks/kirigami checkout .
patch -p1 -d ./frameworks/kirigami <<'EOF'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 103d763..f241f24 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,13 +17,13 @@ endif()
option(BUILD_SHARED_LIBS "Build a shared module" ON)
option(DESKTOP_ENABLED "Build and install The Desktop style" ON)
-option(STATIC_LIBRARY "Build as a static library (deprecated, use BUILD_SHARED_LIBS instead)" OFF)
+option(STATIC_LIBRARY_FLAG "Build as a static library (deprecated, use BUILD_SHARED_LIBS instead)" OFF)
option(BUILD_EXAMPLES "Build and install examples" OFF)
option(DISABLE_DBUS "Build without D-Bus support" OFF)
if(NOT BUILD_SHARED_LIBS)
- set(STATIC_LIBRARY 1)
-elseif(STATIC_LIBRARY)
+ set(STATIC_LIBRARY_FLAG 1)
+elseif(STATIC_LIBRARY_FLAG)
set(BUILD_SHARED_LIBS 0)
endif()
@@ -40,15 +40,15 @@ set(CMAKE_AUTOMOC ON)
set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.kirigami)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
-if(STATIC_LIBRARY)
+if(STATIC_LIBRARY_FLAG)
add_definitions(-DKIRIGAMI_BUILD_TYPE_STATIC)
add_definitions(-DQT_PLUGIN)
add_definitions(-DQT_STATICPLUGIN=1)
-else(STATIC_LIBRARY)
+else(STATIC_LIBRARY_FLAG)
if (BUILD_TESTING)
add_subdirectory(autotests)
endif()
-endif(STATIC_LIBRARY)
+endif(STATIC_LIBRARY_FLAG)
################# set KDE specific information #################
@@ -120,7 +120,7 @@ ecm_find_qmlmodule(QtGraphicalEffects 1.0)
add_subdirectory(src)
-if (BUILD_EXAMPLES AND NOT STATIC_LIBRARY)
+if (BUILD_EXAMPLES AND NOT STATIC_LIBRARY_FLAG)
add_subdirectory(examples)
endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3e1c35a..4cd9aef 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
project(kirigami)
-if (NOT STATIC_LIBRARY)
+if (NOT STATIC_LIBRARY_FLAG)
ecm_create_qm_loader(kirigami_QM_LOADER libkirigami2plugin_qt)
else()
set(KIRIGAMI_STATIC_FILES
@@ -27,7 +27,7 @@ set(kirigami_SRCS
add_subdirectory(libkirigami)
-if(STATIC_LIBRARY)
+if(STATIC_LIBRARY_FLAG)
# Set some variables to insert the right files in the QRC
if(Qt5Qml_VERSION VERSION_LESS 5.10)
set(kirigami_ActionMenuItem ActionMenuItemQt59.qml)
@@ -52,12 +52,12 @@ if(STATIC_LIBRARY)
qt5_add_resources(
RESOURCES ${CMAKE_CURRENT_BINARY_DIR}/../kirigami.qrc
)
-endif(STATIC_LIBRARY)
+endif(STATIC_LIBRARY_FLAG)
add_library(kirigamiplugin ${kirigami_SRCS} ${RESOURCES})
-if(STATIC_LIBRARY)
+if(STATIC_LIBRARY_FLAG)
SET_TARGET_PROPERTIES(kirigamiplugin PROPERTIES
AUTOMOC_MOC_OPTIONS -Muri=org.kde.kirigami)
if (UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "Android" AND NOT(APPLE) AND NOT(DISABLE_DBUS))
@@ -65,9 +65,9 @@ if(STATIC_LIBRARY)
else()
set(Kirigami_EXTRA_LIBS "")
endif()
-else(STATIC_LIBRARY)
+else(STATIC_LIBRARY_FLAG)
set(Kirigami_EXTRA_LIBS KF5::Kirigami2)
-endif(STATIC_LIBRARY)
+endif(STATIC_LIBRARY_FLAG)
target_link_libraries(kirigamiplugin
@@ -77,7 +77,7 @@ target_link_libraries(kirigamiplugin
${Kirigami_EXTRA_LIBS} Qt5::Qml Qt5::Quick Qt5::QuickControls2
)
-if (NOT STATIC_LIBRARY)
+if (NOT STATIC_LIBRARY_FLAG)
add_custom_target(copy)
@@ -118,6 +118,6 @@ if (NOT STATIC_LIBRARY)
install(FILES ${PRI_FILENAME}
DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
-endif(NOT STATIC_LIBRARY)
+endif(NOT STATIC_LIBRARY_FLAG)
install(TARGETS kirigamiplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kirigami.2)
EOF
############ kemoticons ############
echo Patching ./frameworks/kemoticons
git -C ./frameworks/kemoticons checkout .
patch -p1 -d ./frameworks/kemoticons <<'EOF'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e10e741..005a7f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,7 @@ include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
+find_Qt5GuiExtras()
include(GenerateExportHeader)
include(ECMSetupVersion)
@@ -39,6 +40,10 @@ find_package(KF5Archive ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5Service ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
+if(NOT BUILD_SHARED_LIBS)
+ find_package(KF5I18n ${KF5_DEP_VERSION})
+ find_package(KF5DBusAddons ${KF5_DEP_VERSION})
+endif()
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kemoticons_version.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel )
diff --git a/src/integrationplugin/CMakeLists.txt b/src/integrationplugin/CMakeLists.txt
index d12c36f..e4cc21d 100644
--- a/src/integrationplugin/CMakeLists.txt
+++ b/src/integrationplugin/CMakeLists.txt
@@ -3,7 +3,7 @@ set(KEmoticonsIntegrationPlugin_SRCS
ktexttohtml.cpp
)
-add_library(KEmoticonsIntegrationPlugin MODULE ${KEmoticonsIntegrationPlugin_SRCS})
+add_library(KEmoticonsIntegrationPlugin ${MODULE} ${KEmoticonsIntegrationPlugin_SRCS})
target_link_libraries(KEmoticonsIntegrationPlugin
PRIVATE
EOF
############ knotifications ############
echo Patching ./frameworks/knotifications
git -C ./frameworks/knotifications checkout .
patch -p1 -d ./frameworks/knotifications <<'EOF'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index da34e23..a3a120b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,17 +60,23 @@ endif()
set(HAVE_X11 ${X11_FOUND})
set(HAVE_XTEST ${X11_XTest_FOUND})
-if(X11_FOUND)
- find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
-endif()
-if(APPLE)
- find_package(Qt5MacExtras ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
-endif()
+find_Qt5GuiExtras()
find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5Codecs ${KF5_DEP_VERSION} REQUIRED)
find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
+if(NOT BUILD_SHARED_LIBS)
+ find_package(KF5Attica ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5DBusAddons ${KF5_DEP_VERSION} REQUIRED)
+ if(X11_FOUND)
+ find_package(KF5GlobalAccel ${KF5_DEP_VERSION} REQUIRED)
+ endif()
+ find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED)